Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv14820/src/gui
Modified Files:
ClickAtt.cpp ClickURL.cpp MImport.cpp wxAttachDialog.cpp
wxBrowseButton.cpp wxColumnsDlg.cpp wxComposeView.cpp
wxDialogLayout.cpp wxFiltersDialog.cpp wxFolderTree.cpp
wxHeadersDialogs.cpp wxIconManager.cpp wxMDialogs.cpp
wxMFolderDialogs.cpp wxMFrame.cpp wxMainFrame.cpp
wxMenuDefs.cpp wxMessageView.cpp wxModulesDlg.cpp
wxMsgCmdProc.cpp wxOptionsDlg.cpp wxRenameDialog.cpp
wxSearchDialog.cpp wxSortDialog.cpp wxSpamOptions.cpp
wxSubfoldersDialog.cpp wxTemplateDialog.cpp wxThrDialog.cpp
wxWizards.cpp
Log Message:
Header dependency cleanup, last few well aimed hits
Index: ClickAtt.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/ClickAtt.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- ClickAtt.cpp 18 Sep 2003 16:30:51 -0000 1.6
+++ ClickAtt.cpp 19 Sep 2003 13:31:20 -0000 1.7
@@ -29,4 +29,5 @@
#endif //USE_PCH
+#include "MimePart.h"
#include "MessageView.h"
#include "gui/wxMenuDefs.h"
Index: ClickURL.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/ClickURL.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -u -2 -r1.16 -r1.17
--- ClickURL.cpp 18 Sep 2003 16:30:51 -0000 1.16
+++ ClickURL.cpp 19 Sep 2003 13:31:20 -0000 1.17
@@ -25,4 +25,6 @@
#include "Mcommon.h"
#include "Mdefaults.h"
+ #include "guidef.h"
+ #include "MApplication.h"
#include <wx/menu.h>
Index: MImport.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/MImport.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -u -2 -r1.20 -r1.21
--- MImport.cpp 18 Sep 2003 16:30:51 -0000 1.20
+++ MImport.cpp 19 Sep 2003 13:31:20 -0000 1.21
@@ -28,4 +28,5 @@
# include "Mcommon.h"
# include "MApplication.h"
+# include "guidef.h"
# include "gui/wxIconManager.h"
Index: wxAttachDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxAttachDialog.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- wxAttachDialog.cpp 18 Sep 2003 16:30:52 -0000 1.6
+++ wxAttachDialog.cpp 19 Sep 2003 13:31:20 -0000 1.7
@@ -23,4 +23,5 @@
#ifndef USE_PCH
#include "Mcommon.h"
+ #include "guidef.h"
#include <wx/layout.h>
Index: wxBrowseButton.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxBrowseButton.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -b -u -2 -r1.35 -r1.36
--- wxBrowseButton.cpp 18 Sep 2003 16:30:52 -0000 1.35
+++ wxBrowseButton.cpp 19 Sep 2003 13:31:20 -0000 1.36
@@ -23,4 +23,7 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "guidef.h"
+# include "MApplication.h"
+# include "gui/wxIconManager.h"
# include <wx/statbmp.h>
Index: wxColumnsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxColumnsDlg.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- wxColumnsDlg.cpp 18 Sep 2003 16:30:52 -0000 1.10
+++ wxColumnsDlg.cpp 19 Sep 2003 13:31:20 -0000 1.11
@@ -23,4 +23,5 @@
#ifndef USE_PCH
#include "Mcommon.h"
+ #include "guidef.h"
#include "wx/layout.h"
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.343
retrieving revision 1.344
diff -b -u -2 -r1.343 -r1.344
--- wxComposeView.cpp 18 Sep 2003 16:30:52 -0000 1.343
+++ wxComposeView.cpp 19 Sep 2003 13:31:20 -0000 1.344
@@ -35,8 +35,10 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "MApplication.h"
# include "sysutil.h"
# include "strutil.h"
# include "Mdefaults.h"
# include "MHelp.h"
+# include "gui/wxIconManager.h"
# include <wx/sizer.h>
@@ -89,4 +91,5 @@
#include "Address.h"
#include "SendMessage.h"
+#include "Message.h"
#include "modules/Calendar.h"
@@ -663,5 +666,5 @@
// ----------------------------------------------------------------------------
-Composer::Options::Options()
+ComposerOptions::ComposerOptions()
{
m_fontFamily =
@@ -669,5 +672,5 @@
}
-void Composer::Options::Read(Profile *profile)
+void ComposerOptions::Read(Profile *profile)
{
CHECK_RET( profile, _T("NULL profile in Composer::Options::Read") );
@@ -686,5 +689,5 @@
}
-wxFont Composer::Options::GetFont() const
+wxFont ComposerOptions::GetFont() const
{
wxFont font;
@@ -4465,2 +4468,21 @@
}
+Profile *MessageEditor::GetProfile() const
+{
+ return m_composer->GetProfile();
+}
+
+const ComposerOptions& MessageEditor::GetOptions() const
+{
+ return m_composer->GetOptions();
+}
+
+bool MessageEditor::OnFirstTimeFocus()
+{
+ return m_composer->OnFirstTimeFocus();
+}
+
+void MessageEditor::OnFirstTimeModify()
+{
+ m_composer->OnFirstTimeModify();
+}
Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -b -u -2 -r1.102 -r1.103
--- wxDialogLayout.cpp 18 Sep 2003 16:30:52 -0000 1.102
+++ wxDialogLayout.cpp 19 Sep 2003 13:31:21 -0000 1.103
@@ -24,8 +24,13 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "guidef.h"
+# include "MApplication.h"
+# include "Profile.h"
# include "strutil.h"
# include "MHelp.h"
# include "gui/wxMIds.h"
# include "Mdefaults.h"
+# include "gui/wxMFrame.h"
+# include "gui/wxIconManager.h"
# include <wx/layout.h>
@@ -1166,4 +1171,29 @@
return box;
+}
+
+void wxManuallyLaidOutDialog::OnHelp(wxCommandEvent & /*ev*/)
+{
+ mApplication->Help(m_helpId, this);
+}
+
+// ----------------------------------------------------------------------------
+// wxProfileSettingsEditDialog
+// ----------------------------------------------------------------------------
+
+wxProfileSettingsEditDialog::wxProfileSettingsEditDialog(Profile *profile,
+ const wxString& profileKey,
+ wxWindow *parent,
+ const wxString& title)
+ : wxManuallyLaidOutDialog(parent, title, profileKey)
+{
+ m_profile = profile;
+ m_profile->IncRef(); // paranoid
+ m_hasChanges = FALSE;
+}
+
+wxProfileSettingsEditDialog::~wxProfileSettingsEditDialog()
+{
+ m_profile->DecRef();
}
Index: wxFiltersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFiltersDialog.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -b -u -2 -r1.109 -r1.110
--- wxFiltersDialog.cpp 18 Sep 2003 16:30:52 -0000 1.109
+++ wxFiltersDialog.cpp 19 Sep 2003 13:31:21 -0000 1.110
@@ -27,4 +27,5 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "guidef.h"
# include "strutil.h"
# include "Profile.h"
Index: wxFolderTree.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderTree.cpp,v
retrieving revision 1.218
retrieving revision 1.219
diff -b -u -2 -r1.218 -r1.219
--- wxFolderTree.cpp 18 Sep 2003 16:30:52 -0000 1.218
+++ wxFolderTree.cpp 19 Sep 2003 13:31:21 -0000 1.219
@@ -23,7 +23,9 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "guidef.h"
# include "gui/wxMApp.h"
# include "Mdefaults.h" // for READ_APPCONFIG
# include "Mcclient.h"
+# include "gui/wxIconManager.h"
# include <wx/menu.h>
Index: wxHeadersDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxHeadersDialogs.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -b -u -2 -r1.44 -r1.45
--- wxHeadersDialogs.cpp 18 Sep 2003 16:30:53 -0000 1.44
+++ wxHeadersDialogs.cpp 19 Sep 2003 13:31:21 -0000 1.45
@@ -49,4 +49,8 @@
# include "strutil.h" // strutil_flatten_array()
# include "Mdefaults.h"
+# include "Profile.h"
+# include "guidef.h"
+# include "MApplication.h"
+# include "gui/wxIconManager.h"
#endif // USE_PCH
Index: wxIconManager.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxIconManager.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -b -u -2 -r1.101 -r1.102
--- wxIconManager.cpp 18 Sep 2003 16:30:53 -0000 1.101
+++ wxIconManager.cpp 19 Sep 2003 13:31:21 -0000 1.102
@@ -23,4 +23,5 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "MApplication.h"
# include "Profile.h"
# include "strutil.h"
Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.401
retrieving revision 1.402
diff -b -u -2 -r1.401 -r1.402
--- wxMDialogs.cpp 18 Sep 2003 16:30:53 -0000 1.401
+++ wxMDialogs.cpp 19 Sep 2003 13:31:21 -0000 1.402
@@ -35,4 +35,5 @@
# include "sysutil.h" // for sysutil_compare_filenames
# include "MHelp.h"
+# include "gui/wxMFrame.h"
# include <wx/layout.h>
@@ -75,4 +76,5 @@
#include "MFolderDialogs.h"
#include "FolderView.h"
+#include "ASMailFolder.h"
#include "adb/AdbEntry.h"
@@ -1777,4 +1779,13 @@
}
+wxXFaceButton::wxXFaceButton(wxWindow *parent, int id, wxString filename)
+{
+ m_Parent = parent;
+ wxBitmap bmp = mApplication->GetIconManager()->GetBitmap(_T("noxface"));
+ wxBitmapButton::Create(parent,id, bmp, wxDefaultPosition,
+ wxSize(64,64));
+ SetFile(filename);
+}
+
void
wxXFaceButton::SetFile(const wxString &filename)
@@ -3421,2 +3432,7 @@
}
+extern wxWindow *GetDialogParent(const wxWindow *parent)
+{
+ return parent == NULL ? mApplication->TopLevelFrame()
+ : GetFrame(parent);
+}
Index: wxMFolderDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFolderDialogs.cpp,v
retrieving revision 1.182
retrieving revision 1.183
diff -b -u -2 -r1.182 -r1.183
--- wxMFolderDialogs.cpp 18 Sep 2003 16:30:53 -0000 1.182
+++ wxMFolderDialogs.cpp 19 Sep 2003 13:31:21 -0000 1.183
@@ -64,4 +64,6 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "guidef.h"
+# include "MApplication.h"
# include "strutil.h"
# include "Mdefaults.h"
@@ -73,4 +75,5 @@
#include "MFolderDialogs.h"
#include "MFolder.h"
+#include "MailFolder.h"
#include "gui/wxOptionsPage.h"
Index: wxMFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFrame.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -b -u -2 -r1.162 -r1.163
--- wxMFrame.cpp 18 Sep 2003 16:30:53 -0000 1.162
+++ wxMFrame.cpp 19 Sep 2003 13:31:21 -0000 1.163
@@ -31,4 +31,5 @@
# include "gui/wxMFrame.h"
# include "Mdefaults.h"
+# include "gui/wxIconManager.h"
# include <wx/menu.h>
Index: wxMainFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMainFrame.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -b -u -2 -r1.171 -r1.172
--- wxMainFrame.cpp 18 Sep 2003 16:30:54 -0000 1.171
+++ wxMainFrame.cpp 19 Sep 2003 13:31:21 -0000 1.172
@@ -29,4 +29,5 @@
# include "gui/wxMApp.h"
# include "MHelp.h"
+# include "gui/wxIconManager.h"
# include <wx/menu.h>
@@ -35,4 +36,5 @@
#include "MFolder.h"
+#include "ASMailFolder.h"
// these 3 are needed only for SEARCH command processing
Index: wxMenuDefs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMenuDefs.cpp,v
retrieving revision 1.206
retrieving revision 1.207
diff -b -u -2 -r1.206 -r1.207
--- wxMenuDefs.cpp 18 Sep 2003 16:30:54 -0000 1.206
+++ wxMenuDefs.cpp 19 Sep 2003 13:31:21 -0000 1.207
@@ -24,4 +24,5 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "guidef.h"
# include "MApplication.h"
# include "Mdefaults.h"
@@ -32,4 +33,5 @@
# include <wx/choice.h>
# include <wx/menu.h>
+# include <wx/frame.h> // for wxFrame
#endif // USE_PCH
Index: wxMessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMessageView.cpp,v
retrieving revision 1.294
retrieving revision 1.295
diff -b -u -2 -r1.294 -r1.295
--- wxMessageView.cpp 18 Sep 2003 16:30:54 -0000 1.294
+++ wxMessageView.cpp 19 Sep 2003 13:31:21 -0000 1.295
@@ -43,4 +43,5 @@
#include "MessageTemplate.h"
+#include "Message.h"
#include "gui/wxMessageView.h"
Index: wxModulesDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxModulesDlg.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -b -u -2 -r1.27 -r1.28
--- wxModulesDlg.cpp 18 Sep 2003 16:30:55 -0000 1.27
+++ wxModulesDlg.cpp 19 Sep 2003 13:31:21 -0000 1.28
@@ -18,4 +18,8 @@
# include "strutil.h"
# include "Mdefaults.h"
+# include "kbList.h"
+# include "guidef.h"
+# include "MApplication.h"
+# include "Profile.h"
# include <wx/stattext.h> // for wxStaticText
Index: wxMsgCmdProc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMsgCmdProc.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -b -u -2 -r1.46 -r1.47
--- wxMsgCmdProc.cpp 18 Sep 2003 16:30:55 -0000 1.46
+++ wxMsgCmdProc.cpp 19 Sep 2003 13:31:21 -0000 1.47
@@ -28,4 +28,7 @@
#include "strutil.h" // for strutil_uniq_array()
#include "Mdefaults.h"
+ #include "guidef.h"
+ #include "MApplication.h"
+ #include "gui/wxIconManager.h"
#include <wx/layout.h>
@@ -49,4 +52,5 @@
#include "SendMessage.h"
#include "MFolder.h"
+#include "ASMailFolder.h"
#include "MsgCmdProc.h"
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.383
retrieving revision 1.384
diff -b -u -2 -r1.383 -r1.384
--- wxOptionsDlg.cpp 18 Sep 2003 16:30:55 -0000 1.383
+++ wxOptionsDlg.cpp 19 Sep 2003 13:31:21 -0000 1.384
@@ -29,4 +29,6 @@
# include "Threading.h"
# include "Mdefaults.h"
+# include "MApplication.h"
+# include "guidef.h"
# include <wx/statbox.h>
@@ -2973,4 +2975,11 @@
}
}
+}
+
+void wxOptionsPage::SetProfile(Profile *profile)
+{
+ SafeDecRef(m_Profile);
+ m_Profile = profile;
+ SafeIncRef(m_Profile);
}
Index: wxRenameDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxRenameDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- wxRenameDialog.cpp 18 Sep 2003 16:30:55 -0000 1.9
+++ wxRenameDialog.cpp 19 Sep 2003 13:31:21 -0000 1.10
@@ -22,4 +22,5 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "guidef.h"
# include <wx/layout.h>
@@ -32,4 +33,5 @@
#include "MFolder.h"
+#include "MailFolder.h"
#include "gui/wxDialogLayout.h"
Index: wxSearchDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSearchDialog.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- wxSearchDialog.cpp 18 Sep 2003 16:30:55 -0000 1.9
+++ wxSearchDialog.cpp 19 Sep 2003 13:31:21 -0000 1.10
@@ -26,4 +26,5 @@
#include "MHelp.h"
#include "Mdefaults.h"
+ #include "guidef.h"
#include <wx/layout.h>
Index: wxSortDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSortDialog.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -u -2 -r1.14 -r1.15
--- wxSortDialog.cpp 18 Sep 2003 16:30:55 -0000 1.14
+++ wxSortDialog.cpp 19 Sep 2003 13:31:21 -0000 1.15
@@ -23,4 +23,6 @@
#include "Mdefaults.h"
#include "MHelp.h"
+ #include "guidef.h"
+ #include "Profile.h"
#include <wx/layout.h>
Index: wxSpamOptions.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSpamOptions.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- wxSpamOptions.cpp 18 Sep 2003 16:30:55 -0000 1.4
+++ wxSpamOptions.cpp 19 Sep 2003 13:31:21 -0000 1.5
@@ -29,4 +29,5 @@
# include "strutil.h"
# include "Profile.h"
+# include "MApplication.h"
#endif // USE_PCH
Index: wxSubfoldersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSubfoldersDialog.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -b -u -2 -r1.77 -r1.78
--- wxSubfoldersDialog.cpp 18 Sep 2003 16:30:55 -0000 1.77
+++ wxSubfoldersDialog.cpp 19 Sep 2003 13:31:21 -0000 1.78
@@ -26,4 +26,6 @@
# include "Mcommon.h"
# include "Mdefaults.h"
+# include "guidef.h"
+# include "MApplication.h"
# include <wx/statbox.h>
@@ -34,4 +36,5 @@
#include <wx/tokenzr.h>
+#include "ASMailFolder.h"
#include "MFolder.h"
#include "ListReceiver.h"
Index: wxTemplateDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxTemplateDialog.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -u -2 -r1.33 -r1.34
--- wxTemplateDialog.cpp 18 Sep 2003 16:30:56 -0000 1.33
+++ wxTemplateDialog.cpp 19 Sep 2003 13:31:21 -0000 1.34
@@ -25,4 +25,6 @@
# include "Mcommon.h"
# include "strutil.h"
+# include "guidef.h"
+# include "Profile.h"
# include <wx/layout.h>
Index: wxThrDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxThrDialog.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- wxThrDialog.cpp 18 Sep 2003 16:30:56 -0000 1.8
+++ wxThrDialog.cpp 19 Sep 2003 13:31:22 -0000 1.9
@@ -20,4 +20,6 @@
#include "Mcommon.h"
#include "Mdefaults.h"
+ #include "guidef.h"
+ #include "Profile.h"
#include <wx/layout.h>
Index: wxWizards.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxWizards.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -b -u -2 -r1.44 -r1.45
--- wxWizards.cpp 18 Sep 2003 16:30:56 -0000 1.44
+++ wxWizards.cpp 19 Sep 2003 13:31:22 -0000 1.45
@@ -25,4 +25,7 @@
# include "strutil.h"
# include "Mdefaults.h"
+# include "MApplication.h"
+# include "guidef.h"
+# include "gui/wxIconManager.h"
# include <wx/stattext.h> // for wxStaticText
@@ -32,4 +35,5 @@
#include "MailFolderCC.h"
+#include "MFolder.h"
#include <wx/wizard.h>
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
