Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv29729/src/gui
Modified Files:
ClickAtt.cpp ClickURL.cpp MImport.cpp Mdnd.cpp
wxAttachDialog.cpp wxBrowseButton.cpp wxColumnsDlg.cpp
wxComposeView.cpp wxDialogLayout.cpp wxFiltersDialog.cpp
wxFolderMenu.cpp wxFolderTree.cpp wxFolderView.cpp
wxHeadersDialogs.cpp wxIconManager.cpp wxMApp.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
wxTextDialog.cpp wxThrDialog.cpp wxWizards.cpp wxllist.cpp
wxlparser.cpp wxlwindow.cpp
Log Message:
Include dependencies cleanup, stage two (final so far)
Index: ClickAtt.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/ClickAtt.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- ClickAtt.cpp 22 Jul 2003 22:01:39 -0000 1.5
+++ ClickAtt.cpp 18 Sep 2003 16:30:51 -0000 1.6
@@ -24,5 +24,4 @@
#ifndef USE_PCH
#include "Mcommon.h"
- #include "gui/wxMenuDefs.h"
#include "strutil.h"
@@ -31,4 +30,5 @@
#include "MessageView.h"
+#include "gui/wxMenuDefs.h"
#include "ClickAtt.h"
Index: ClickURL.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/ClickURL.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -u -2 -r1.15 -r1.16
--- ClickURL.cpp 16 Sep 2003 21:32:44 -0000 1.15
+++ ClickURL.cpp 18 Sep 2003 16:30:51 -0000 1.16
@@ -24,6 +24,5 @@
#ifndef USE_PCH
#include "Mcommon.h"
- #include "MDialogs.h"
- #include "gui/wxOptionsDlg.h"
+ #include "Mdefaults.h"
#include <wx/menu.h>
@@ -33,12 +32,14 @@
#endif //USE_PCH
+#include "gui/wxMDialogs.h"
+#include "gui/wxOptionsDlg.h"
+
#include "ClickURL.h"
#include "MessageView.h"
+#include "gui/wxMenuDefs.h"
#include "Composer.h"
#include "Collect.h"
-#include "Mpers.h"
-
#include <wx/clipbrd.h>
@@ -46,4 +47,6 @@
#include <sys/stat.h>
#endif
+
+class MPersMsgBox;
// ----------------------------------------------------------------------------
Index: MImport.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/MImport.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -b -u -2 -r1.19 -r1.20
--- MImport.cpp 15 Sep 2003 17:01:36 -0000 1.19
+++ MImport.cpp 18 Sep 2003 16:30:51 -0000 1.20
@@ -27,8 +27,12 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "MApplication.h"
+# include "gui/wxIconManager.h"
# include <wx/sizer.h>
# include <wx/statbmp.h>
# include <wx/statbox.h>
+# include <wx/listbox.h>
+# include <wx/checkbox.h>
#endif // USE_PCH
@@ -36,5 +40,10 @@
#include <wx/statline.h>
+#include "gui/wxMDialogs.h"
+#include "MFolder.h"
+
#include "MImport.h"
+
+class MPersMsgBox;
// ----------------------------------------------------------------------------
Index: Mdnd.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/Mdnd.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -u -2 -r1.16 -r1.17
--- Mdnd.cpp 15 Sep 2003 17:01:36 -0000 1.16
+++ Mdnd.cpp 18 Sep 2003 16:30:51 -0000 1.17
@@ -36,4 +36,5 @@
#include "MsgCmdProc.h"
+#include "gui/wxMenuDefs.h"
#include "UIdArray.h"
Index: wxAttachDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxAttachDialog.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- wxAttachDialog.cpp 15 Sep 2003 17:01:36 -0000 1.5
+++ wxAttachDialog.cpp 18 Sep 2003 16:30:52 -0000 1.6
@@ -27,8 +27,7 @@
#include <wx/statbox.h>
-#endif
+#endif // USE_PCH
#include "gui/wxDialogLayout.h"
-
#include "AttachDialog.h"
Index: wxBrowseButton.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxBrowseButton.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -b -u -2 -r1.34 -r1.35
--- wxBrowseButton.cpp 16 Sep 2003 21:32:44 -0000 1.34
+++ wxBrowseButton.cpp 18 Sep 2003 16:30:52 -0000 1.35
@@ -28,10 +28,11 @@
# include <wx/statbox.h>
# include <wx/dirdlg.h>
-#endif
+# include <wx/filedlg.h>
+#endif // USE_PCH
#include <wx/colordlg.h>
#include <wx/fontdlg.h>
#include <wx/fontutil.h>
-#include <wx/imaglist.h>
+#include <wx/imaglist.h> // for wxImageList
#include "MFolder.h"
Index: wxColumnsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxColumnsDlg.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- wxColumnsDlg.cpp 15 Sep 2003 17:01:36 -0000 1.9
+++ wxColumnsDlg.cpp 18 Sep 2003 16:30:52 -0000 1.10
@@ -26,10 +26,10 @@
#include "wx/layout.h"
#include "wx/statbox.h"
- #include "wx/stattext.h"
-#endif
+ #include "wx/stattext.h" // for wxStaticText
+ #include "wx/checklst.h"
+#endif // USE_PCH
#include "gui/wxSelectionDlg.h"
-#include "wx/checklst.h"
#include "wx/spinctrl.h"
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.342
retrieving revision 1.343
diff -b -u -2 -r1.342 -r1.343
--- wxComposeView.cpp 15 Sep 2003 17:01:36 -0000 1.342
+++ wxComposeView.cpp 18 Sep 2003 16:30:52 -0000 1.343
@@ -36,13 +36,14 @@
# include "Mcommon.h"
# include "sysutil.h"
-
+# include "strutil.h"
+# include "Mdefaults.h"
# include "MHelp.h"
-# include <wx/process.h>
# include <wx/sizer.h>
# include <wx/menu.h>
+# include <wx/filedlg.h>
# include <wx/stattext.h>
+#endif // USE_PCH
-# include <ctype.h> // for isspace
#ifdef __CYGWIN__
# include <sys/unistd.h> // for getpid()
@@ -51,6 +52,11 @@
# include <process.h> // for getpid()
#endif
-#endif // USE_PCH
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <ctype.h> // for isspace
+
+#include <wx/process.h>
#include <wx/file.h>
#include <wx/ffile.h>
@@ -74,4 +80,5 @@
#include "gui/wxDialogLayout.h"
#include "gui/wxComposeView.h"
+#include "gui/wxMenuDefs.h"
#include "adb/AdbManager.h"
@@ -79,4 +86,7 @@
#include "TemplateDialog.h"
#include "AttachDialog.h"
+#include "MFolder.h"
+#include "Address.h"
+#include "SendMessage.h"
#include "modules/Calendar.h"
Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -b -u -2 -r1.101 -r1.102
--- wxDialogLayout.cpp 16 Sep 2003 21:32:44 -0000 1.101
+++ wxDialogLayout.cpp 18 Sep 2003 16:30:52 -0000 1.102
@@ -27,15 +27,17 @@
# include "MHelp.h"
# include "gui/wxMIds.h"
+# include "Mdefaults.h"
# include <wx/layout.h>
-# include <wx/stattext.h>
+# include <wx/stattext.h> // for wxStaticText
# include <wx/statbox.h>
# include <wx/statbmp.h>
-#endif
+#endif // USE_PCH
-#include <wx/imaglist.h>
+#include <wx/imaglist.h> // for wxImageList
#include "gui/wxOptionsPage.h"
#include "gui/wxBrowseButton.h"
+#include "gui/wxMenuDefs.h"
#include "Mupgrade.h" // for VerifyEMailSendingWorks()
Index: wxFiltersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFiltersDialog.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -b -u -2 -r1.108 -r1.109
--- wxFiltersDialog.cpp 14 Sep 2003 14:32:10 -0000 1.108
+++ wxFiltersDialog.cpp 18 Sep 2003 16:30:52 -0000 1.109
@@ -27,41 +27,31 @@
#ifndef USE_PCH
# include "Mcommon.h"
-# include "Mdefaults.h"
-# include "guidef.h"
# include "strutil.h"
-# include "MFrame.h"
-# include "MDialogs.h"
# include "Profile.h"
# include "MApplication.h"
-# include "MailFolder.h"
# include "Profile.h"
-# include "MModule.h"
-# include "MHelp.h"
# include "strutil.h"
-#endif
+# include "MHelp.h"
+
+# include <wx/stattext.h> // for wxStaticText
+# include <wx/layout.h>
+# include <wx/checklst.h>
+# include <wx/statbox.h>
+#endif // USE_PCH
-#include "MHelp.h"
-#include "gui/wxMIds.h"
-#include "Mpers.h"
#include "MFilter.h"
#include "MFolder.h"
+#include "MailFolder.h"
+#include "MModule.h"
#include "MFilterLang.h" // for SPAM_TEST_XXX constants
-#include <wx/window.h>
-#include <wx/confbase.h>
-#include "wx/persctrl.h"
-#include <wx/stattext.h>
-#include <wx/layout.h>
-#include <wx/checklst.h>
-#include <wx/statbox.h>
-
#include "gui/wxBrowseButton.h"
#include "gui/wxDialogLayout.h"
#include "gui/wxFiltersDialog.h"
-#include "gui/wxOptionsPage.h"
-#include "gui/wxOptionsDlg.h"
#include "gui/wxSelectionDlg.h"
#include "gui/wxSpamOptions.h"
+
+class WXDLLEXPORT wxWindow;
// ----------------------------------------------------------------------------
Index: wxFolderMenu.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderMenu.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- wxFolderMenu.cpp 22 Jul 2003 22:01:40 -0000 1.10
+++ wxFolderMenu.cpp 18 Sep 2003 16:30:52 -0000 1.11
@@ -26,6 +26,4 @@
# include "Mcommon.h"
-# include "gui/wxMenuDefs.h"
-
# include <wx/menu.h>
#endif // USE_PCH
@@ -33,4 +31,5 @@
#include "MEvent.h"
#include "MFolder.h"
+#include "gui/wxMenuDefs.h"
#include "gui/wxFolderMenu.h"
Index: wxFolderTree.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderTree.cpp,v
retrieving revision 1.217
retrieving revision 1.218
diff -b -u -2 -r1.217 -r1.218
--- wxFolderTree.cpp 16 Sep 2003 21:32:44 -0000 1.217
+++ wxFolderTree.cpp 18 Sep 2003 16:30:52 -0000 1.218
@@ -22,11 +22,15 @@
#ifndef USE_PCH
+# include "Mcommon.h"
# include "gui/wxMApp.h"
+# include "Mdefaults.h" // for READ_APPCONFIG
+# include "Mcclient.h"
# include <wx/menu.h>
#endif // USE_PCH
-#include "MDialogs.h"
+#include "gui/wxMDialogs.h"
+#include "gui/wxMenuDefs.h"
#include "MFolder.h"
#include "MFolderDialogs.h"
@@ -36,5 +40,5 @@
#include <wx/tokenzr.h>
-#include <wx/imaglist.h>
+#include <wx/imaglist.h> // for wxImageList
#include <wx/persctrl.h>
@@ -43,4 +47,5 @@
#include "MFCache.h"
+#include "MFStatus.h"
#if wxUSE_DRAG_AND_DROP
@@ -48,5 +53,5 @@
#endif // wxUSE_DRAG_AND_DROP
-#include "Mcclient.h"
+class MPersMsgBox;
extern "C"
Index: wxFolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderView.cpp,v
retrieving revision 1.642
retrieving revision 1.643
diff -b -u -2 -r1.642 -r1.643
--- wxFolderView.cpp 14 Sep 2003 16:10:48 -0000 1.642
+++ wxFolderView.cpp 18 Sep 2003 16:30:53 -0000 1.643
@@ -29,6 +29,4 @@
# include "strutil.h"
# include "MFrame.h"
-# include "MLogFrame.h"
-# include "PathFinder.h"
# include "Profile.h"
# include "Mdefaults.h"
@@ -39,7 +37,8 @@
# include "Sorting.h"
# include "Threading.h"
+# include "gui/wxMIds.h"
+# include "MHelp.h"
# include <wx/dynarray.h>
-# include <wx/colour.h>
# include <wx/menu.h>
@@ -47,6 +46,4 @@
# include <wx/sizer.h>
-#else
-# include <wx/imaglist.h>
#endif // USE_PCH
@@ -58,4 +55,6 @@
#include <wx/menuitem.h>
#include <wx/fontutil.h>
+#include <wx/colour.h>
+#include <wx/imaglist.h>
#include "wx/persctrl.h"
@@ -65,4 +64,7 @@
#include "MFCache.h"
+#include "MLogFrame.h"
+#include "PathFinder.h"
+
#include "FolderMonitor.h" // for case WXK_F5
@@ -80,4 +82,7 @@
#include "UIdArray.h"
+#include "MFStatus.h"
+#include "gui/wxMDialogs.h"
+#include "gui/wxMenuDefs.h"
#include "gui/wxFolderView.h"
#include "gui/wxFolderMenu.h"
@@ -89,7 +94,5 @@
#endif // wxUSE_DRAG_AND_DROP
-#include "gui/wxMIds.h"
#include "MDialogs.h"
-#include "MHelp.h"
#include "miscutil.h" // for UpdateTitleAndStatusBars
Index: wxHeadersDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxHeadersDialogs.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -b -u -2 -r1.43 -r1.44
--- wxHeadersDialogs.cpp 16 Sep 2003 21:32:44 -0000 1.43
+++ wxHeadersDialogs.cpp 18 Sep 2003 16:30:53 -0000 1.44
@@ -43,12 +43,13 @@
# include <wx/layout.h>
# include <wx/statbox.h>
-# include <wx/stattext.h>
+# include <wx/stattext.h> // for wxStaticText
# include <wx/utils.h> // for wxMax
+# include <wx/checklst.h>
# include "strutil.h" // strutil_flatten_array()
-#endif
+# include "Mdefaults.h"
+#endif // USE_PCH
-#include <wx/imaglist.h>
-#include <wx/checklst.h>
+#include <wx/imaglist.h> // for wxImageList
#include "gui/wxSelectionDlg.h"
Index: wxIconManager.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxIconManager.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -b -u -2 -r1.100 -r1.101
--- wxIconManager.cpp 16 Sep 2003 21:32:44 -0000 1.100
+++ wxIconManager.cpp 18 Sep 2003 16:30:53 -0000 1.101
@@ -23,13 +23,16 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "Profile.h"
# include "strutil.h"
+# include "gui/wxIconManager.h"
+# include "Mdefaults.h"
+#endif // USE_PCH
+
#if wxCHECK_VERSION(2, 5, 0)
# include <wx/iconloc.h>
#endif
-#endif
-#include "gui/wxIconManager.h"
-#include "MDialogs.h"
-#include "PathFinder.h"
+#include "gui/wxMDialogs.h"
+#include "PathFinder.h" // for PathFinder
#include <wx/mimetype.h>
Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.274
retrieving revision 1.275
diff -b -u -2 -r1.274 -r1.275
--- wxMApp.cpp 16 Sep 2003 21:32:44 -0000 1.274
+++ wxMApp.cpp 18 Sep 2003 16:30:53 -0000 1.275
@@ -25,15 +25,22 @@
# include "Mcommon.h"
# include "gui/wxMApp.h"
-#endif
+# include "strutil.h"
+# include "kbList.h"
+# include "MHelp.h"
+# include "gui/wxIconManager.h"
+# include "Mdefaults.h"
+# include "Profile.h"
+
+# include <wx/msgdlg.h> // for wxMessageBox
+# include <wx/menu.h>
+# include <wx/statusbr.h>
+#endif // USE_PCH
-#include <wx/msgdlg.h> // for wxMessageBox
#include "wx/persctrl.h" // for wxPMessageBoxEnable
#include <wx/ffile.h>
-#include <wx/menu.h>
-#include <wx/statusbr.h>
#include <wx/fs_mem.h>
#include <wx/fs_inet.h>
#include <wx/cmdline.h>
-#include <wx/encconv.h>
+#include <wx/encconv.h> // for wxEncodingConverter
#ifdef USE_DIALUP
@@ -62,6 +69,7 @@
#endif // Windows/!Windows
-#include "MHelp.h"
+#include "PathFinder.h"
+#include "gui/wxMDialogs.h"
#include "gui/wxMainFrame.h"
#include "FolderMonitor.h"
Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.400
retrieving revision 1.401
diff -b -u -2 -r1.400 -r1.401
--- wxMDialogs.cpp 14 Sep 2003 16:10:49 -0000 1.400
+++ wxMDialogs.cpp 18 Sep 2003 16:30:53 -0000 1.401
@@ -27,10 +27,11 @@
# include "strutil.h"
# include "MFrame.h"
-# include "MDialogs.h"
# include "Profile.h"
# include "MApplication.h"
-# include "MailFolder.h"
# include "Profile.h"
-# include "MModule.h"
+# include "gui/wxMApp.h"
+# include "gui/wxMIds.h"
+# include "gui/wxIconManager.h"
+# include "sysutil.h" // for sysutil_compare_filenames
# include "MHelp.h"
@@ -40,5 +41,4 @@
# include <wx/menu.h>
# include <wx/radiobox.h>
-# include <wx/confbase.h>
# include <wx/checklst.h>
# include <wx/gauge.h>
@@ -48,30 +48,28 @@
# include <wx/choice.h>
# include <wx/textdlg.h>
-# include <wx/treectrl.h>
# include <wx/utils.h>
# include <wx/msgdlg.h>
# include <wx/choicdlg.h>
+# include <wx/filedlg.h>
+# include <wx/help.h>
#endif // USE_PCH
#include "Mpers.h"
+#include "MDialogs.h"
+#include "MailFolder.h"
+#include "MModule.h"
#include "XFace.h"
-#include "MHelp.h"
-
-#include "gui/wxMApp.h"
-#include "gui/wxMIds.h"
-
#include "MFolder.h"
#include "MSearch.h"
-#include "gui/wxIconManager.h"
-
#include "wx/persctrl.h"
-#include <wx/help.h>
#include <wx/tipdlg.h>
#include <wx/statline.h>
#include <wx/minifram.h>
#include <wx/fs_mem.h> // memory filesystem for startup screen
+#include <wx/confbase.h>
+#include <wx/treectrl.h>
#include "MFolderDialogs.h"
@@ -86,6 +84,4 @@
#include "gui/wxSelectionDlg.h"
#include "gui/wxIdentityCombo.h"
-
-#include "sysutil.h" // for sysutil_compare_filenames
#include <errno.h>
Index: wxMFolderDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFolderDialogs.cpp,v
retrieving revision 1.181
retrieving revision 1.182
diff -b -u -2 -r1.181 -r1.182
--- wxMFolderDialogs.cpp 15 Sep 2003 17:01:37 -0000 1.181
+++ wxMFolderDialogs.cpp 18 Sep 2003 16:30:53 -0000 1.182
@@ -65,8 +65,9 @@
# include "Mcommon.h"
# include "strutil.h"
+# include "Mdefaults.h"
# include <wx/layout.h>
-# include <wx/stattext.h>
-#endif
+# include <wx/stattext.h> // for wxStaticText
+#endif // USE_PCH
#include "MFolderDialogs.h"
Index: wxMFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFrame.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -b -u -2 -r1.161 -r1.162
--- wxMFrame.cpp 15 Sep 2003 17:01:37 -0000 1.161
+++ wxMFrame.cpp 18 Sep 2003 16:30:53 -0000 1.162
@@ -24,9 +24,15 @@
#include "Mpch.h"
-#include "Mcommon.h"
#ifndef USE_PCH
+# include "Mcommon.h"
+# include "MApplication.h"
+# include "MHelp.h"
+# include "gui/wxMFrame.h"
+# include "Mdefaults.h"
+
# include <wx/menu.h>
# include <wx/toolbar.h>
+# include <wx/choice.h>
#endif // USE_PCH
@@ -37,6 +43,4 @@
#endif // Python
-#include "MHelp.h"
-
#include "FolderMonitor.h"
@@ -44,14 +48,15 @@
#include "Composer.h"
-
#include "MImport.h"
#include "gui/wxFiltersDialog.h" // for ConfigureAllFilters()
#include "gui/wxOptionsDlg.h"
+#include "gui/wxMDialogs.h"
#include "adb/AdbFrame.h"
-#include "gui/wxMFrame.h"
#include "gui/wxIdentityCombo.h"
+#include "gui/wxMenuDefs.h"
#include <wx/fontmap.h> // for GetEncodingDescription()
+#include <wx/confbase.h>
#include <wx/printdlg.h>
@@ -60,4 +65,6 @@
typedef wxGenericPrintDialog wxPrintDialog;
#endif
+
+class MPersMsgBox;
// ----------------------------------------------------------------------------
Index: wxMainFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMainFrame.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -b -u -2 -r1.170 -r1.171
--- wxMainFrame.cpp 15 Sep 2003 17:01:38 -0000 1.170
+++ wxMainFrame.cpp 18 Sep 2003 16:30:54 -0000 1.171
@@ -27,8 +27,10 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "gui/wxMApp.h"
+# include "MHelp.h"
# include <wx/menu.h>
# include <wx/dirdlg.h>
-#endif
+#endif // USE_PCH
#include "MFolder.h"
@@ -40,5 +42,4 @@
#include "gui/wxMainFrame.h"
-#include "gui/wxMApp.h"
#include "gui/wxFolderView.h"
#include "gui/wxFolderTree.h"
@@ -48,6 +49,6 @@
#include "MFolderDialogs.h" // for ShowFolderCreateDialog
-#include "MHelp.h"
-#include "MDialogs.h"
+#include "gui/wxMDialogs.h"
+#include "gui/wxMenuDefs.h"
// define this for future, less broken versions of wxWindows to dynamically
Index: wxMenuDefs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMenuDefs.cpp,v
retrieving revision 1.205
retrieving revision 1.206
diff -b -u -2 -r1.205 -r1.206
--- wxMenuDefs.cpp 16 Sep 2003 21:32:44 -0000 1.205
+++ wxMenuDefs.cpp 18 Sep 2003 16:30:54 -0000 1.206
@@ -21,20 +21,18 @@
#include "Mpch.h"
-#include "Mcommon.h"
#ifndef USE_PCH
-
+# include "Mcommon.h"
# include "MApplication.h"
+# include "Mdefaults.h"
+# include "Profile.h" // FIXME: Why is this header needed?
+# include "gui/wxIconManager.h"
# include <wx/toolbar.h>
# include <wx/choice.h>
-#endif
-
-#include <wx/menu.h>
-
-#include "Profile.h"
+# include <wx/menu.h>
+#endif // USE_PCH
-#include "gui/wxIconManager.h"
-#include "gui/wxIdentityCombo.h"
+#include "gui/wxIdentityCombo.h" // for CreateIdentCombo
#include "gui/wxMenuDefs.h"
Index: wxMessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMessageView.cpp,v
retrieving revision 1.293
retrieving revision 1.294
diff -b -u -2 -r1.293 -r1.294
--- wxMessageView.cpp 15 Sep 2003 17:01:38 -0000 1.293
+++ wxMessageView.cpp 18 Sep 2003 16:30:54 -0000 1.294
@@ -27,4 +27,6 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "Mdefaults.h"
+# include "Profile.h"
# include <wx/stattext.h>
@@ -36,4 +38,5 @@
#include "MsgCmdProc.h"
#include "FolderView.h"
+#include "gui/wxMenuDefs.h"
#include "UIdArray.h"
Index: wxModulesDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxModulesDlg.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -b -u -2 -r1.26 -r1.27
--- wxModulesDlg.cpp 15 Sep 2003 17:01:38 -0000 1.26
+++ wxModulesDlg.cpp 18 Sep 2003 16:30:55 -0000 1.27
@@ -16,14 +16,14 @@
# include "Mcommon.h"
# include "MHelp.h"
+# include "strutil.h"
+# include "Mdefaults.h"
-# include <wx/stattext.h>
+# include <wx/stattext.h> // for wxStaticText
# include <wx/statbox.h>
+# include <wx/checklst.h>
+# include <wx/layout.h>
#endif // USE_PCH
-#include <wx/checklst.h>
-#include <wx/layout.h>
-
#include "Mpers.h"
-
#include "MModule.h"
Index: wxMsgCmdProc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMsgCmdProc.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -b -u -2 -r1.45 -r1.46
--- wxMsgCmdProc.cpp 16 Sep 2003 21:32:45 -0000 1.45
+++ wxMsgCmdProc.cpp 18 Sep 2003 16:30:55 -0000 1.46
@@ -25,14 +25,19 @@
#ifndef USE_PCH
+ #include "Mcommon.h"
+ #include "strutil.h" // for strutil_uniq_array()
+ #include "Mdefaults.h"
+
#include <wx/layout.h>
#include <wx/statbox.h>
+ #include <wx/dynarray.h>
#endif // USE_PCH
-#include <wx/imaglist.h>
+#include <wx/imaglist.h> // for wxImageList
-#include "strutil.h" // for strutil_uniq_array()
#include "Collect.h" // for InteractivelyCollectAddresses()
#include "UIdArray.h"
+#include "gui/wxMenuDefs.h"
#include "HeaderInfo.h"
@@ -42,4 +47,6 @@
#include "ClickAtt.h"
#include "Composer.h"
+#include "SendMessage.h"
+#include "MFolder.h"
#include "MsgCmdProc.h"
@@ -55,5 +62,4 @@
class AsyncStatusHandler;
-#include <wx/dynarray.h>
WX_DEFINE_ARRAY(AsyncStatusHandler *, ArrayAsyncStatus);
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.382
retrieving revision 1.383
diff -b -u -2 -r1.382 -r1.383
--- wxOptionsDlg.cpp 16 Sep 2003 21:32:45 -0000 1.382
+++ wxOptionsDlg.cpp 18 Sep 2003 16:30:55 -0000 1.383
@@ -25,20 +25,23 @@
# include "MHelp.h"
# include "strutil.h"
-# include "Mpers.h"
# include "Sorting.h"
# include "Threading.h"
+# include "Mdefaults.h"
# include <wx/statbox.h>
# include <wx/stattext.h>
# include <wx/textdlg.h> // for wxGetTextFromUser()
-#endif
+# include <wx/checklst.h>
+# include <wx/layout.h>
+#endif // USE_PCH
-#include <wx/checklst.h>
-#include <wx/layout.h>
-#include <wx/dialup.h>
+#include <wx/confbase.h>
-#include "Mpers.h"
+#if defined(OS_WIN) && defined(USE_DIALUP)
+# include <wx/dialup.h> // for wxDialUpManager
+#endif
+#include "Mpers.h"
#include "Moptions.h" // we need all MP_XXX for our arrays
@@ -54,4 +57,5 @@
#include "gui/wxOptionsDlg.h"
#include "gui/wxOptionsPage.h"
+#include "gui/wxMenuDefs.h"
#include "HeadersDialogs.h"
Index: wxRenameDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxRenameDialog.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- wxRenameDialog.cpp 15 Sep 2003 17:01:38 -0000 1.8
+++ wxRenameDialog.cpp 18 Sep 2003 16:30:55 -0000 1.9
@@ -25,5 +25,5 @@
# include <wx/layout.h>
# include <wx/statbox.h>
-# include <wx/stattext.h>
+# include <wx/stattext.h> // for wxStaticText
# include <wx/textdlg.h>
#endif // USE_PCH
Index: wxSearchDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSearchDialog.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- wxSearchDialog.cpp 15 Sep 2003 17:01:38 -0000 1.8
+++ wxSearchDialog.cpp 18 Sep 2003 16:30:55 -0000 1.9
@@ -25,12 +25,12 @@
#include "MHelp.h"
+ #include "Mdefaults.h"
#include <wx/layout.h>
- #include <wx/stattext.h>
+ #include <wx/stattext.h> // for wxStaticText
#include <wx/statbox.h>
#endif // USE_PCH
#include "MFolder.h"
-
#include "MSearch.h"
Index: wxSortDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSortDialog.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -u -2 -r1.13 -r1.14
--- wxSortDialog.cpp 15 Sep 2003 17:01:38 -0000 1.13
+++ wxSortDialog.cpp 18 Sep 2003 16:30:55 -0000 1.14
@@ -21,9 +21,9 @@
#include "Sorting.h"
-
+ #include "Mdefaults.h"
#include "MHelp.h"
#include <wx/layout.h>
- #include <wx/stattext.h>
+ #include <wx/stattext.h> // for wxStaticText
#include <wx/statbox.h>
#ifdef OS_WIN // cygwin and mingw
Index: wxSpamOptions.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSpamOptions.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- wxSpamOptions.cpp 15 Sep 2003 16:14:22 -0000 1.3
+++ wxSpamOptions.cpp 18 Sep 2003 16:30:55 -0000 1.4
@@ -29,5 +29,5 @@
# include "strutil.h"
# include "Profile.h"
-#endif
+#endif // USE_PCH
#include <stdlib.h>
Index: wxSubfoldersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSubfoldersDialog.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -b -u -2 -r1.76 -r1.77
--- wxSubfoldersDialog.cpp 15 Sep 2003 17:01:38 -0000 1.76
+++ wxSubfoldersDialog.cpp 18 Sep 2003 16:30:55 -0000 1.77
@@ -25,14 +25,14 @@
#ifndef USE_PCH
# include "Mcommon.h"
+# include "Mdefaults.h"
# include <wx/statbox.h>
-# include <wx/stattext.h>
+# include <wx/stattext.h> // for wxStaticText
# include <wx/layout.h>
-#endif
+#endif // USE_PCH
#include <wx/tokenzr.h>
#include "MFolder.h"
-
#include "ListReceiver.h"
Index: wxTemplateDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxTemplateDialog.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -b -u -2 -r1.32 -r1.33
--- wxTemplateDialog.cpp 15 Sep 2003 17:01:38 -0000 1.32
+++ wxTemplateDialog.cpp 18 Sep 2003 16:30:56 -0000 1.33
@@ -30,9 +30,12 @@
# include <wx/stattext.h>
# include <wx/menu.h>
-#endif
+# include <wx/filedlg.h>
+#endif // USE_PCH
#include "gui/wxDialogLayout.h"
#include "TemplateDialog.h"
+
+#include <wx/confbase.h>
// ----------------------------------------------------------------------------
Index: wxTextDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxTextDialog.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- wxTextDialog.cpp 15 Sep 2003 17:01:38 -0000 1.7
+++ wxTextDialog.cpp 18 Sep 2003 16:30:56 -0000 1.8
@@ -26,5 +26,8 @@
#include <wx/sizer.h>
-#endif
+ #include <wx/button.h>
+ #include <wx/filedlg.h>
+ #include <wx/textctrl.h>
+#endif // USE_PCH
#include <wx/ffile.h>
Index: wxThrDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxThrDialog.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- wxThrDialog.cpp 15 Sep 2003 17:01:39 -0000 1.7
+++ wxThrDialog.cpp 18 Sep 2003 16:30:56 -0000 1.8
@@ -19,8 +19,9 @@
#ifndef USE_PCH
#include "Mcommon.h"
+ #include "Mdefaults.h"
#include <wx/layout.h>
- #include <wx/stattext.h>
#include <wx/statbox.h>
+ #include <wx/stattext.h> // for wxStaticText
#endif // USE_PCH
Index: wxWizards.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxWizards.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -b -u -2 -r1.43 -r1.44
--- wxWizards.cpp 15 Sep 2003 17:01:39 -0000 1.43
+++ wxWizards.cpp 18 Sep 2003 16:30:56 -0000 1.44
@@ -24,5 +24,8 @@
# include "Mcommon.h"
# include "strutil.h"
-#endif
+# include "Mdefaults.h"
+
+# include <wx/stattext.h> // for wxStaticText
+#endif // USE_PCH
#include "Mpers.h"
@@ -30,5 +33,4 @@
#include "MailFolderCC.h"
-#include <wx/stattext.h>
#include <wx/wizard.h>
Index: wxllist.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxllist.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -b -u -2 -r1.155 -r1.156
--- wxllist.cpp 23 Jul 2003 00:39:33 -0000 1.155
+++ wxllist.cpp 18 Sep 2003 16:30:56 -0000 1.156
@@ -34,13 +34,4 @@
#include "Mpch.h"
-#ifdef M_BASEDIR
-# include "Mcommon.h"
-# include "gui/wxllist.h"
-# include "gui/wxlparser.h"
-#else
-# include "wxllist.h"
-# include "wxlparser.h"
-#endif
-
#ifndef USE_PCH
# if wxUSE_IOSTREAMH
@@ -50,4 +41,8 @@
# endif
+# ifdef M_BASEDIR
+# include "Mcommon.h"
+# endif
+
# include <wx/dc.h>
# include <wx/dcps.h>
@@ -55,4 +50,13 @@
# include <wx/log.h>
# include <wx/filefn.h>
+# include <wx/msgdlg.h>
+#endif // USE_PCH
+
+#ifdef M_BASEDIR
+# include "gui/wxllist.h"
+# include "gui/wxlparser.h"
+#else
+# include "wxllist.h"
+# include "wxlparser.h"
#endif
Index: wxlparser.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxlparser.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -b -u -2 -r1.53 -r1.54
--- wxlparser.cpp 4 Jun 2002 21:54:03 -0000 1.53
+++ wxlparser.cpp 18 Sep 2003 16:30:56 -0000 1.54
@@ -19,4 +19,8 @@
#include "Mpch.h"
+#ifndef USE_PCH
+# include "Mcommon.h"
+#endif // USE_PCH
+
#include "gui/wxllist.h"
#include "gui/wxlparser.h"
Index: wxlwindow.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxlwindow.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -b -u -2 -r1.139 -r1.140
--- wxlwindow.cpp 14 Aug 2003 01:12:31 -0000 1.139
+++ wxlwindow.cpp 18 Sep 2003 16:30:56 -0000 1.140
@@ -50,4 +50,7 @@
#include <wx/textctrl.h>
#include <wx/dataobj.h>
+#include <wx/menu.h>
+#include <wx/statusbr.h>
+#include <wx/dcmemory.h>
#ifdef WXLAYOUT_USE_CARET
-------------------------------------------------------
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
