[M-CVS] CVS: M/src/gui ClickURL.cpp,1.13,1.14 MImport.cpp,1.18,1.19 Mdnd.cpp,1.15,1.16 wxAttachDialog.cpp,1.4,1.5 wxBrowseButton.cpp,1.32,1.33 wxColumnsDlg.cpp,1.8,1.9 wxComposeView.cpp,1.341,1.342 wxDialogLayout.cpp,1.99,1.100 wxFolderTree.cpp,1.215,1.216 wxHeadersDialogs.cpp,1.41,1.42 wxIconManager.cpp,1.98,1.99 wxMApp.cpp,1.272,1.273 wxMFolderDialogs.cpp,1.180,1.181 wxMFrame.cpp,1.160,1.161 wxMainFrame.cpp,1.169,1.170 wxMenuDefs.cpp,1.203,1.204 wxMessageView.cpp,1.292,1.293 wxModulesDlg.cpp,1.25,1.26 wxMsgCmdProc.cpp,1.43,1.44 wxOptionsDlg.cpp,1.380,1.381 wxRenameDialog.cpp,1.7,1.8 wxSearchDialog.cpp,1.7,1.8 wxSortDialog.cpp,1.12,1.13 wxSubfoldersDialog.cpp,1.75,1.76 wxTemplateDialog.cpp,1.31,1.32 wxTextDialog.cpp,1.6,1.7 wxThrDialog.cpp,1.6,1.7 wxWizards.cpp,1.42,1.43

Mon, 15 Sep 2003 10:03:40 -0700 

Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv9700/src/gui

Modified Files:
        ClickURL.cpp MImport.cpp Mdnd.cpp wxAttachDialog.cpp 
        wxBrowseButton.cpp wxColumnsDlg.cpp wxComposeView.cpp 
        wxDialogLayout.cpp wxFolderTree.cpp wxHeadersDialogs.cpp 
        wxIconManager.cpp wxMApp.cpp wxMFolderDialogs.cpp wxMFrame.cpp 
        wxMainFrame.cpp wxMenuDefs.cpp wxMessageView.cpp 
        wxModulesDlg.cpp wxMsgCmdProc.cpp wxOptionsDlg.cpp 
        wxRenameDialog.cpp wxSearchDialog.cpp wxSortDialog.cpp 
        wxSubfoldersDialog.cpp wxTemplateDialog.cpp wxTextDialog.cpp 
        wxThrDialog.cpp wxWizards.cpp 
Log Message:
Cleanup of #include dependecies, stage one

Index: ClickURL.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/ClickURL.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -u -2 -r1.13 -r1.14
--- ClickURL.cpp        14 Sep 2003 16:10:47 -0000      1.13
+++ ClickURL.cpp        15 Sep 2003 17:01:36 -0000      1.14
@@ -24,5 +24,4 @@
 #ifndef USE_PCH
    #include "Mcommon.h"
-   #include "gui/wxMenuDefs.h"
    #include "MDialogs.h"
    #include "gui/wxOptionsDlg.h"
@@ -34,6 +33,4 @@
 #endif //USE_PCH
 
-#include "Mdefaults.h"
-
 #include "ClickURL.h"
 #include "MessageView.h"
@@ -41,6 +38,4 @@
 #include "Composer.h"
 #include "Collect.h"
-
-#include "Mpers.h"
 
 #include <wx/clipbrd.h>

Index: MImport.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/MImport.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -u -2 -r1.18 -r1.19
--- MImport.cpp 14 Sep 2003 16:10:47 -0000      1.18
+++ MImport.cpp 15 Sep 2003 17:01:36 -0000      1.19
@@ -28,8 +28,4 @@
 #  include "Mcommon.h"
 
-#  include "guidef.h"
-
-#  include <wx/checkbox.h>
-#  include <wx/listbox.h>
 #  include <wx/sizer.h>
 #  include <wx/statbmp.h>
@@ -40,5 +36,4 @@
 #include <wx/statline.h>
 
-#include "Mpers.h"
 #include "MImport.h"
 

Index: Mdnd.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/Mdnd.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -u -2 -r1.15 -r1.16
--- Mdnd.cpp    12 Sep 2002 02:36:49 -0000      1.15
+++ Mdnd.cpp    15 Sep 2003 17:01:36 -0000      1.16
@@ -30,8 +30,5 @@
 #  include "Mcommon.h"
 
-#  include "MailFolder.h"
-
 #  include "guidef.h"
-#  include "gui/wxMenuDefs.h"    // for WXMENU_MSG_DROP_TO_FOLDER
 #endif // USE_PCH
 

Index: wxAttachDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxAttachDialog.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- wxAttachDialog.cpp  22 Jul 2003 22:01:40 -0000      1.4
+++ wxAttachDialog.cpp  15 Sep 2003 17:01:36 -0000      1.5
@@ -26,7 +26,4 @@
    #include <wx/layout.h>
 
-   #include <wx/textctrl.h>
-   #include <wx/radiobox.h>
-   #include <wx/checkbox.h>
    #include <wx/statbox.h>
 #endif

Index: wxBrowseButton.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxBrowseButton.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -b -u -2 -r1.32 -r1.33
--- wxBrowseButton.cpp  30 Aug 2003 23:46:46 -0000      1.32
+++ wxBrowseButton.cpp  15 Sep 2003 17:01:36 -0000      1.33
@@ -23,11 +23,6 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
-#  include "MApplication.h"
-#  include "Profile.h"
-#  include "guidef.h"
 
-#  include <wx/cmndata.h>
 #  include <wx/statbmp.h>
-#  include <wx/dcmemory.h>
 #  include <wx/layout.h>
 #  include <wx/statbox.h>
@@ -35,5 +30,4 @@
 #endif
 
-#include <wx/imaglist.h>
 #include <wx/colordlg.h>
 #include <wx/fontdlg.h>
@@ -41,7 +35,5 @@
 
 #include "MFolder.h"
-#include "MFolderDialogs.h"
 
-#include "gui/wxIconManager.h"
 #include "gui/wxDialogLayout.h"
 

Index: wxColumnsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxColumnsDlg.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- wxColumnsDlg.cpp    22 Jul 2003 22:01:40 -0000      1.8
+++ wxColumnsDlg.cpp    15 Sep 2003 17:01:36 -0000      1.9
@@ -24,5 +24,4 @@
    #include "Mcommon.h"
 
-   #include "wx/window.h"
    #include "wx/layout.h"
    #include "wx/statbox.h"

Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.341
retrieving revision 1.342
diff -b -u -2 -r1.341 -r1.342
--- wxComposeView.cpp   14 Sep 2003 16:10:47 -0000      1.341
+++ wxComposeView.cpp   15 Sep 2003 17:01:36 -0000      1.342
@@ -35,14 +35,7 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
-#  include "strutil.h"
 #  include "sysutil.h"
 
-#  include "PathFinder.h"
-#  include "Profile.h"
 #  include "MHelp.h"
-#  include "MFrame.h"
-
-#  include "MApplication.h"
-#  include "gui/wxMApp.h"
 
 #  include <wx/process.h>
@@ -50,7 +43,6 @@
 #  include <wx/menu.h>
 #  include <wx/stattext.h>
-#  include <wx/textctrl.h>
 
-#  include <ctype.h>          // for isspace()
+#  include <ctype.h>            // for isspace
 #ifdef __CYGWIN__
 #  include <sys/unistd.h>     // for getpid()
@@ -61,5 +53,4 @@
 #endif // USE_PCH
 
-#include <wx/filename.h>
 #include <wx/file.h>
 #include <wx/ffile.h>
@@ -75,21 +66,8 @@
 #endif
 
-#include "wx/persctrl.h"
-
-#include "Mdefaults.h"
 #include "Mpers.h"
 
-#include "Address.h"
-
-#include "FolderView.h"
-#include "MailFolder.h"
-#include "Message.h"
-#include "SendMessage.h"
-
-#include "MDialogs.h"
 #include "HeadersDialogs.h"
 
-#include "gui/wxIconManager.h"
-
 #include "gui/wxIdentityCombo.h"
 #include "gui/wxOptionsDlg.h"
@@ -97,14 +75,9 @@
 #include "gui/wxComposeView.h"
 
-#include "MessageEditor.h"
-
-#include "adb/AdbEntry.h"
 #include "adb/AdbManager.h"
 
-#include "MessageTemplate.h"
 #include "TemplateDialog.h"
 #include "AttachDialog.h"
 
-#include "MModule.h"
 #include "modules/Calendar.h"
 

Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -b -u -2 -r1.99 -r1.100
--- wxDialogLayout.cpp  14 Sep 2003 16:10:48 -0000      1.99
+++ wxDialogLayout.cpp  15 Sep 2003 17:01:37 -0000      1.100
@@ -24,40 +24,18 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
-#  include "MApplication.h"
-#  include "Profile.h"
-#  include "guidef.h"
 #  include "strutil.h"
 #  include "MHelp.h"
 #  include "gui/wxMIds.h"
 
-#  include <wx/log.h>
-#  include <wx/choice.h>
-#  include <wx/control.h>
-#  include <wx/dcclient.h>
 #  include <wx/layout.h>
-#  include <wx/dynarray.h>
 #  include <wx/stattext.h>
-#  include <wx/settings.h>
-#  include <wx/listbox.h>
-#  include <wx/checkbox.h>
-#  include <wx/radiobox.h>
-#  include <wx/combobox.h>
 #  include <wx/statbox.h>
 #  include <wx/statbmp.h>
 #endif
 
-#include <wx/imaglist.h>
-#include <wx/notebook.h>
-#include "wx/persctrl.h"
-
-#include "gui/wxIconManager.h"
-#include "gui/wxDialogLayout.h"
 #include "gui/wxOptionsPage.h"
 #include "gui/wxBrowseButton.h"
 
-#include "MEvent.h"
 #include "Mupgrade.h"      // for VerifyEMailSendingWorks()
-
-#include "Mdefaults.h"
 
 // ----------------------------------------------------------------------------

Index: wxFolderTree.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderTree.cpp,v
retrieving revision 1.215
retrieving revision 1.216
diff -b -u -2 -r1.215 -r1.216
--- wxFolderTree.cpp    1 Sep 2003 01:07:43 -0000       1.215
+++ wxFolderTree.cpp    15 Sep 2003 17:01:37 -0000      1.216
@@ -22,11 +22,7 @@
 
 #ifndef USE_PCH
-#  include "MApplication.h"
 #  include "gui/wxMApp.h"
-#  include "Profile.h"
 
-#  include <wx/confbase.h>
 #  include <wx/menu.h>
-#  include <wx/textdlg.h>
 #endif // USE_PCH
 
@@ -39,14 +35,9 @@
 #include "miscutil.h" // for ParseColourString()
 
-#include <wx/imaglist.h>
-#include <wx/treectrl.h>
 #include <wx/tokenzr.h>
-#include <wx/dnd.h>
 #include <wx/persctrl.h>
 
 #include "gui/wxOptionsDlg.h"
 #include "gui/wxFolderTree.h"
-#include "gui/wxIconManager.h"
-#include "gui/wxMainFrame.h"
 
 #include "MFCache.h"

Index: wxHeadersDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxHeadersDialogs.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -b -u -2 -r1.41 -r1.42
--- wxHeadersDialogs.cpp        29 Aug 2003 00:10:01 -0000      1.41
+++ wxHeadersDialogs.cpp        15 Sep 2003 17:01:37 -0000      1.42
@@ -40,33 +40,15 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
-#  include "MApplication.h"
-#  include "Profile.h"
-#  include "guidef.h"
-#  include "MHelp.h"
 
 #  include <wx/layout.h>
-#  include <wx/menuitem.h>
 #  include <wx/statbox.h>
 #  include <wx/stattext.h>
-#  include <wx/checkbox.h>
-#  include <wx/radiobox.h>
-#  include <wx/textctrl.h>
-#  include <wx/statbmp.h>
-
-#  include <wx/utils.h>  // wxMax()
+#  include <wx/utils.h>         // for wxMax
 
 #  include "strutil.h"   // strutil_flatten_array()
 #endif
 
-#include <wx/imaglist.h>
-#include <wx/notebook.h>
 #include <wx/checklst.h>
-#include <wx/listctrl.h>
-#include "wx/persctrl.h"
-
-#include "Mdefaults.h"
 
-#include "gui/wxDialogLayout.h"
-#include "gui/wxIconManager.h"
 #include "gui/wxSelectionDlg.h"
 

Index: wxIconManager.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxIconManager.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -b -u -2 -r1.98 -r1.99
--- wxIconManager.cpp   22 Jul 2003 22:01:41 -0000      1.98
+++ wxIconManager.cpp   15 Sep 2003 17:01:37 -0000      1.99
@@ -24,14 +24,8 @@
 #  include "Mcommon.h"
 #  include "strutil.h"
-#  include "gui/wxMApp.h"
-#  include "Profile.h"
-#  include "PathFinder.h"
-#  include "MApplication.h"
 #if wxCHECK_VERSION(2, 5, 0)
 #  include <wx/iconloc.h>
 #endif
 #endif
-
-#include "Mdefaults.h"
 
 #include "gui/wxIconManager.h"

Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.272
retrieving revision 1.273
diff -b -u -2 -r1.272 -r1.273
--- wxMApp.cpp  14 Sep 2003 16:10:49 -0000      1.272
+++ wxMApp.cpp  15 Sep 2003 17:01:37 -0000      1.273
@@ -24,29 +24,13 @@
 #ifndef  USE_PCH
 #  include "Mcommon.h"
-#  include "guidef.h"
-#  include "MFrame.h"
-#  include "gui/wxMFrame.h"
-#  include "strutil.h"
-#  include "kbList.h"
-#  include "PathFinder.h"
-#  include "Profile.h"
-#  include "MApplication.h"
 #  include "gui/wxMApp.h"
-
-#  include "Mcclient.h"
-
-#  include <wx/log.h>
-#  include <wx/config.h>
-#  include <wx/generic/dcpsg.h>
-#  include <wx/thread.h>
 #endif
 
 #include <wx/msgdlg.h>   // for wxMessageBox
-#include "wx/persctrl.h" // for wxPMessageBoxEnable(d)
+#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_zip.h> // for zipped docs
 #include <wx/fs_inet.h>
 #include <wx/cmdline.h>
@@ -57,5 +41,4 @@
 
 #include <wx/fontmap.h>
-#include <wx/encconv.h>
 #include <wx/tokenzr.h>
 
@@ -78,13 +61,7 @@
 #endif // Windows/!Windows
 
-#include "MObject.h"
-
-#include "Mdefaults.h"
-#include "MDialogs.h"
-
 #include "MHelp.h"
 
 #include "gui/wxMainFrame.h"
-#include "gui/wxIconManager.h"
 #include "FolderMonitor.h"
 #include "MModule.h"

Index: wxMFolderDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFolderDialogs.cpp,v
retrieving revision 1.180
retrieving revision 1.181
diff -b -u -2 -r1.180 -r1.181
--- wxMFolderDialogs.cpp        29 Aug 2003 00:10:01 -0000      1.180
+++ wxMFolderDialogs.cpp        15 Sep 2003 17:01:37 -0000      1.181
@@ -64,34 +64,15 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
-#  include "MApplication.h"
-#  include "Profile.h"
-#  include "guidef.h"
 #  include "strutil.h"
 
-#  include <wx/dynarray.h>
-#  include <wx/log.h>
 #  include <wx/layout.h>
 #  include <wx/stattext.h>
-#  include <wx/radiobox.h>
-#  include <wx/choice.h>
 #endif
 
-#include <wx/imaglist.h>
-#include <wx/notebook.h>
-#include "wx/persctrl.h"
-#include <wx/statbmp.h>
-#include <wx/tooltip.h>
-
-#include "MDialogs.h"
 #include "MFolderDialogs.h"
-#include "MailFolder.h"
 #include "MFolder.h"
 
-#include "Mdefaults.h"
-
-#include "gui/wxDialogLayout.h"
 #include "gui/wxOptionsPage.h"
 #include "gui/wxBrowseButton.h"
-#include "gui/wxFolderTree.h"
 
 // why is this conditional?

Index: wxMFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFrame.cpp,v
retrieving revision 1.160
retrieving revision 1.161
diff -b -u -2 -r1.160 -r1.161
--- wxMFrame.cpp        22 Jul 2003 12:07:38 -0000      1.160
+++ wxMFrame.cpp        15 Sep 2003 17:01:37 -0000      1.161
@@ -27,18 +27,4 @@
 
 #ifndef  USE_PCH
-#  include "guidef.h"
-#  include "strutil.h"
-#  include "MFrame.h"
-#  include "kbList.h"
-#  include "PathFinder.h"
-#  include "Profile.h"
-#  include "Mdefaults.h"
-#  include "MApplication.h"
-#  include "gui/wxMApp.h"
-#  include "MailFolder.h"
-#  include "Message.h"
-#  include "MEvent.h"
-
-#  include <wx/confbase.h>
 #  include <wx/menu.h>
 #  include <wx/toolbar.h>
@@ -52,20 +38,14 @@
 
 #include "MHelp.h"
-#include "MFolder.h"
 
 #include "FolderMonitor.h"
 
-#include "MessageTemplate.h"
 #include "TemplateDialog.h"
 
 #include "Composer.h"
-#include "MDialogs.h"
 
-#include "MFolderDialogs.h"
-#include "MModule.h"
 #include "MImport.h"
 
 #include "gui/wxFiltersDialog.h" // for ConfigureAllFilters()
-#include "gui/wxIconManager.h"
 #include "gui/wxOptionsDlg.h"
 #include "adb/AdbFrame.h"

Index: wxMainFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMainFrame.cpp,v
retrieving revision 1.169
retrieving revision 1.170
diff -b -u -2 -r1.169 -r1.170
--- wxMainFrame.cpp     14 Sep 2003 14:10:13 -0000      1.169
+++ wxMainFrame.cpp     15 Sep 2003 17:01:38 -0000      1.170
@@ -27,18 +27,9 @@
 #ifndef   USE_PCH
 #  include "Mcommon.h"
-#  include "guidef.h"
-#  include "MFrame.h"
-#  include "Mdefaults.h"
-#  include "strutil.h"
 
 #  include <wx/menu.h>
 #  include <wx/dirdlg.h>
-#  include <wx/statusbr.h>
-#  include <wx/toolbar.h>
 #endif
 
-#include "wx/persctrl.h"
-#include <wx/menuitem.h>
-
 #include "MFolder.h"
 
@@ -50,5 +41,4 @@
 #include "gui/wxMainFrame.h"
 #include "gui/wxMApp.h"
-#include "gui/wxIconManager.h"
 #include "gui/wxFolderView.h"
 #include "gui/wxFolderTree.h"
@@ -60,6 +50,4 @@
 #include "MHelp.h"
 #include "MDialogs.h"
-
-#include "MModule.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.203
retrieving revision 1.204
diff -b -u -2 -r1.203 -r1.204
--- wxMenuDefs.cpp      14 Sep 2003 14:10:13 -0000      1.203
+++ wxMenuDefs.cpp      15 Sep 2003 17:01:38 -0000      1.204
@@ -24,10 +24,6 @@
 
 #ifndef USE_PCH
-#  include "PathFinder.h"
 
 #  include "MApplication.h"
-#  include "gui/wxMApp.h"
-
-#  include "guidef.h"
 
 #  include <wx/toolbar.h>
@@ -37,6 +33,4 @@
 #include <wx/menu.h>
 
-#include "Mdefaults.h"
-
 #include "gui/wxIconManager.h"
 
@@ -50,4 +44,6 @@
    #define wxITEM_RADIO TRUE
 #endif
+
+class MOption;
 
 // ----------------------------------------------------------------------------

Index: wxMessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMessageView.cpp,v
retrieving revision 1.292
retrieving revision 1.293
diff -b -u -2 -r1.292 -r1.293
--- wxMessageView.cpp   14 Sep 2003 14:10:13 -0000      1.292
+++ wxMessageView.cpp   15 Sep 2003 17:01:38 -0000      1.293
@@ -27,28 +27,10 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
-#  include "strutil.h"
-#  include "guidef.h"
 
-#  include "PathFinder.h"
-#  include "Profile.h"
-
-#  include "MFrame.h"
-#  include "MLogFrame.h"
-
-#  include "MApplication.h"
-#  include "gui/wxMApp.h"
-#  include "gui/wxIconManager.h"
-
-#  include "wx/stattext.h"
+#  include <wx/stattext.h>
+#  include <wx/app.h>
+#  include <wx/menu.h>
 #endif //USE_PCH
 
-#include "Mdefaults.h"
-#include "MHelp.h"
-#include "Message.h"
-#include "ASMailFolder.h"
-#include "MFolder.h"
-#include "MDialogs.h"
-
-#include "MessageView.h"
 #include "MessageViewer.h"
 #include "MsgCmdProc.h"
@@ -58,18 +40,6 @@
 
 #include "MessageTemplate.h"
-#include "Composer.h"
 
-#include "gui/wxIconManager.h"
 #include "gui/wxMessageView.h"
-#include "gui/wxllist.h"
-#include "gui/wxlwindow.h"
-#include "gui/wxlparser.h"
-#include "gui/wxOptionsDlg.h"
-
-#include <wx/dynarray.h>
-#include <wx/file.h>
-#include <wx/mimetype.h>
-#include <wx/fontmap.h>
-#include <wx/splitter.h>
 
 // ----------------------------------------------------------------------------

Index: wxModulesDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxModulesDlg.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -2 -r1.25 -r1.26
--- wxModulesDlg.cpp    22 Jul 2003 22:01:41 -0000      1.25
+++ wxModulesDlg.cpp    15 Sep 2003 17:01:38 -0000      1.26
@@ -15,33 +15,16 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
-#  include "MApplication.h"
-#  include "gui/wxMApp.h"
 #  include "MHelp.h"
-#  include "gui/wxMIds.h"
-#  include "strutil.h"
 
-#  include <wx/defs.h>
-#  include <wx/event.h>
-#  include <wx/log.h>
-#  include <wx/control.h>
 #  include <wx/stattext.h>
-#  include <wx/listbox.h>
-#  include <wx/checkbox.h>
-#  include <wx/radiobox.h>
-#  include <wx/combobox.h>
 #  include <wx/statbox.h>
-#  include <wx/statbmp.h>
-#  include <wx/dialog.h>
 #endif // USE_PCH
 
-#include <wx/persctrl.h>
 #include <wx/checklst.h>
 #include <wx/layout.h>
 
-#include "Mdefaults.h"
 #include "Mpers.h"
 
 #include "MModule.h"
-#include "MDialogs.h"
 
 #include "gui/wxDialogLayout.h"

Index: wxMsgCmdProc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMsgCmdProc.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -b -u -2 -r1.43 -r1.44
--- wxMsgCmdProc.cpp    14 Sep 2003 16:10:49 -0000      1.43
+++ wxMsgCmdProc.cpp    15 Sep 2003 17:01:38 -0000      1.44
@@ -27,5 +27,4 @@
    #include <wx/layout.h>
    #include <wx/statbox.h>
-   #include <wx/stattext.h>
 #endif // USE_PCH
 
@@ -33,9 +32,6 @@
 #include "Collect.h"          // for InteractivelyCollectAddresses()
 
-#include "MFolder.h"
-
 #include "UIdArray.h"
 
-#include "ASMailFolder.h"
 #include "HeaderInfo.h"
 
@@ -47,11 +43,5 @@
 #include "MsgCmdProc.h"
 
-#include "gui/wxMenuDefs.h"
-#include "MDialogs.h"         // for MDialog_ShowText
-
 #include "gui/wxDialogLayout.h"
-
-#include <wx/imaglist.h>
-#include <wx/treectrl.h>
 
 #if wxUSE_DRAG_AND_DROP

Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.380
retrieving revision 1.381
diff -b -u -2 -r1.380 -r1.381
--- wxOptionsDlg.cpp    14 Sep 2003 14:10:13 -0000      1.380
+++ wxOptionsDlg.cpp    15 Sep 2003 17:01:38 -0000      1.381
@@ -23,7 +23,4 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
-#  include "MApplication.h"
-#  include "Profile.h"
-#  include "guidef.h"
 #  include "MHelp.h"
 #  include "strutil.h"
@@ -33,35 +30,15 @@
 #  include "Threading.h"
 
-#  include <wx/dynarray.h>
-#  include <wx/checkbox.h>
-#  include <wx/listbox.h>
-#  include <wx/radiobox.h>
 #  include <wx/statbox.h>
 #  include <wx/stattext.h>
-#  include <wx/statbmp.h>
-#  include <wx/textctrl.h>
 #  include <wx/textdlg.h>  // for wxGetTextFromUser()
-
-#  include <wx/utils.h>    // for wxStripMenuCodes()
 #endif
 
-#include <wx/log.h>
-#include <wx/imaglist.h>
-#include <wx/notebook.h>
-#include <wx/confbase.h>
-
-#include <wx/menuitem.h>
 #include <wx/checklst.h>
 
 #include <wx/layout.h>
-#include <wx/dialup.h>
-
-#include "wx/persctrl.h"
 
 #include "Mpers.h"
-#include "MDialogs.h"
-#include "Mcallbacks.h"
 
-#include "Mdefaults.h"
 #include "Moptions.h"            // we need all MP_XXX for our arrays
 
@@ -75,6 +52,4 @@
 
 #include "gui/wxBrowseButton.h"  // for wxStaticCast(wxColorBrowseButton) only
-#include "gui/wxIconManager.h"
-#include "gui/wxDialogLayout.h"
 #include "gui/wxOptionsDlg.h"
 #include "gui/wxOptionsPage.h"

Index: wxRenameDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxRenameDialog.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- wxRenameDialog.cpp  22 Jul 2003 22:01:41 -0000      1.7
+++ wxRenameDialog.cpp  15 Sep 2003 17:01:38 -0000      1.8
@@ -22,14 +22,8 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
-#  include "guidef.h"
 
-#  include <wx/log.h>
 #  include <wx/layout.h>
-
-#  include <wx/choice.h>
 #  include <wx/statbox.h>
 #  include <wx/stattext.h>
-#  include <wx/radiobox.h>
-
 #  include <wx/textdlg.h>
 #endif // USE_PCH

Index: wxSearchDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSearchDialog.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- wxSearchDialog.cpp  22 Jul 2003 22:01:41 -0000      1.7
+++ wxSearchDialog.cpp  15 Sep 2003 17:01:38 -0000      1.8
@@ -26,16 +26,8 @@
    #include "MHelp.h"
 
-   #include "guidef.h"
-
-   #include <wx/window.h>
    #include <wx/layout.h>
-
-   #include <wx/checkbox.h>
-   #include <wx/choice.h>
    #include <wx/stattext.h>
    #include <wx/statbox.h>
 #endif // USE_PCH
-
-#include "Mdefaults.h"
 
 #include "MFolder.h"

Index: wxSortDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSortDialog.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- wxSortDialog.cpp    22 Jul 2003 22:01:41 -0000      1.12
+++ wxSortDialog.cpp    15 Sep 2003 17:01:38 -0000      1.13
@@ -24,11 +24,5 @@
    #include "MHelp.h"
 
-   #include "guidef.h"
-
-   #include <wx/window.h>
    #include <wx/layout.h>
-
-   #include <wx/checkbox.h>
-   #include <wx/choice.h>
    #include <wx/stattext.h>
    #include <wx/statbox.h>
@@ -37,6 +31,4 @@
 #endif
 #endif // USE_PCH
-
-#include "Mdefaults.h"
 
 #include "gui/wxDialogLayout.h"

Index: wxSubfoldersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSubfoldersDialog.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -b -u -2 -r1.75 -r1.76
--- wxSubfoldersDialog.cpp      14 Sep 2003 16:10:50 -0000      1.75
+++ wxSubfoldersDialog.cpp      15 Sep 2003 17:01:38 -0000      1.76
@@ -25,23 +25,14 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
-#  include "MApplication.h"
-#  include "Profile.h"
-#  include "guidef.h"
-#  include "strutil.h"
 
-#  include <wx/app.h>
 #  include <wx/statbox.h>
 #  include <wx/stattext.h>
-#  include <wx/textctrl.h>
 #  include <wx/layout.h>
 #endif
 
-#include <wx/treectrl.h>
 #include <wx/tokenzr.h>
 
 #include "MFolder.h"
-#include "Mpers.h"
 
-#include "ASMailFolder.h"
 #include "ListReceiver.h"
 

Index: wxTemplateDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxTemplateDialog.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -b -u -2 -r1.31 -r1.32
--- wxTemplateDialog.cpp        31 Aug 2003 13:04:04 -0000      1.31
+++ wxTemplateDialog.cpp        15 Sep 2003 17:01:38 -0000      1.32
@@ -24,25 +24,12 @@
 #ifndef USE_PCH
 #  include "Mcommon.h"
-#  include "MApplication.h"
-#  include "Profile.h"
-#  include "guidef.h"
 #  include "strutil.h"
 
-#  include <wx/combobox.h>
 #  include <wx/layout.h>
 #  include <wx/statbox.h>
 #  include <wx/stattext.h>
-#  include <wx/statbmp.h>
-#  include <wx/textctrl.h>
 #  include <wx/menu.h>
-#  include <wx/listbox.h>
-#  include <wx/choicdlg.h>
 #endif
 
-#include "Mdefaults.h"
-
-#include "MessageTemplate.h"
-
-#include "MDialogs.h"
 #include "gui/wxDialogLayout.h"
 

Index: wxTextDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxTextDialog.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- wxTextDialog.cpp    22 Jul 2003 22:01:41 -0000      1.6
+++ wxTextDialog.cpp    15 Sep 2003 17:01:38 -0000      1.7
@@ -25,6 +25,4 @@
    #include "gui/wxMFrame.h"
 
-   #include <wx/button.h>
-   #include <wx/textctrl.h>
    #include <wx/sizer.h>
 #endif

Index: wxThrDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxThrDialog.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- wxThrDialog.cpp     22 Jul 2003 22:01:41 -0000      1.6
+++ wxThrDialog.cpp     15 Sep 2003 17:01:39 -0000      1.7
@@ -19,20 +19,9 @@
 #ifndef USE_PCH
    #include "Mcommon.h"
-   #include "MHelp.h"
 
-   #include "Threading.h"
-
-   #include "guidef.h"
-
-   #include <wx/window.h>
    #include <wx/layout.h>
-
-   #include <wx/checkbox.h>
-   #include <wx/choice.h>
    #include <wx/stattext.h>
    #include <wx/statbox.h>
 #endif // USE_PCH
-
-#include "Mdefaults.h"
 
 #include "gui/wxDialogLayout.h"

Index: wxWizards.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxWizards.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -b -u -2 -r1.42 -r1.43
--- wxWizards.cpp       22 Jul 2003 22:01:41 -0000      1.42
+++ wxWizards.cpp       15 Sep 2003 17:01:39 -0000      1.43
@@ -23,43 +23,16 @@
 #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"
 #endif
 
-#include "MFolder.h"
 #include "Mpers.h"
 
 #include "MailFolderCC.h"
 
-#include "MHelp.h"
-#include "gui/wxMApp.h"
-#include "gui/wxMIds.h"
-
-#include "gui/wxIconManager.h"
-
-#include <wx/window.h>
-#include <wx/radiobox.h>
 #include <wx/stattext.h>
-#include <wx/statbmp.h>
-#include <wx/choice.h>
-#include <wx/textdlg.h>
-#include <wx/help.h>
 #include <wx/wizard.h>
 
-#include "MFolderDialogs.h"
-
 #include "gui/wxBrowseButton.h"
 #include "gui/wxDialogLayout.h"
-
-#include <errno.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

Reply via email to