Update of /cvsroot/mahogany/M/include/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv29729/include/gui
Modified Files:
wxBrowseButton.h wxComposeView.h wxDialogLayout.h
wxFolderTree.h wxFolderView.h wxIconManager.h wxMDialogs.h
wxMFrame.h wxMainFrame.h wxMessageView.h wxOptionsDlg.h
wxOptionsPage.h wxllist.h wxlparser.h wxlwindow.h
Log Message:
Include dependencies cleanup, stage two (final so far)
Index: wxBrowseButton.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxBrowseButton.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -b -u -2 -r1.22 -r1.23
--- wxBrowseButton.h 15 Sep 2003 17:01:36 -0000 1.22
+++ wxBrowseButton.h 18 Sep 2003 16:30:43 -0000 1.23
@@ -18,5 +18,5 @@
# include <wx/button.h>
# include <wx/textctrl.h>
-#endif
+#endif // USE_PCH
// forward declaration
Index: wxComposeView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxComposeView.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -b -u -2 -r1.91 -r1.92
--- wxComposeView.h 22 Jul 2003 22:01:38 -0000 1.91
+++ wxComposeView.h 18 Sep 2003 16:30:44 -0000 1.92
@@ -23,13 +23,7 @@
#ifndef USE_PCH
-# include "Message.h"
-# include "gui/wxMenuDefs.h"
-# include "gui/wxMFrame.h"
-# include "gui/wxIconManager.h"
-# include "Profile.h"
-# include "kbList.h"
#endif // USE_PCH
-#include "Composer.h" // the base class
+#include "Composer.h" // for Composer
#include "MessageEditor.h" // for MessageEditor::InsertMode enum
@@ -43,5 +37,5 @@
class wxComposeView;
class wxEnhancedPanel;
-
+class SendMessage;
class MessageEditor;
@@ -52,6 +46,4 @@
class WXDLLEXPORT wxSplitterWindow;
class WXDLLEXPORT wxTextCtrl;
-
-#include <wx/dynarray.h>
WX_DEFINE_ARRAY(wxRcptExtraControl *, ArrayRcptControls);
Index: wxDialogLayout.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxDialogLayout.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -b -u -2 -r1.70 -r1.71
--- wxDialogLayout.h 22 Aug 2003 22:14:52 -0000 1.70
+++ wxDialogLayout.h 18 Sep 2003 16:30:44 -0000 1.71
@@ -19,13 +19,13 @@
// -----------------------------------------------------------------------------
-#include <wx/persctrl.h> // needed for wxPNotebook
-
-#include "MDialogs.h"
-
#ifndef USE_PCH
-#ifdef OS_WIN // cygwin and mingw
-# include <wx/scrolwin.h>
-#endif
+# include "Profile.h"
+
+# include <wx/textctrl.h>
#endif // USE_PCH
+
+#include <wx/persctrl.h> // needed for wxPNotebook
+
+#include "gui/wxMDialogs.h"
// use wxListbook instead of wxNotebook if available
Index: wxFolderTree.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxFolderTree.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -u -2 -r1.17 -r1.18
--- wxFolderTree.h 7 Sep 2002 20:35:29 -0000 1.17
+++ wxFolderTree.h 18 Sep 2003 16:30:44 -0000 1.18
@@ -14,4 +14,8 @@
#define _WXFOLDERTREE_H
+#ifndef USE_PCH
+# include <wx/window.h>
+#endif // USE_PCH
+
// fwd declarations
class wxFolderTreeImpl;
@@ -20,5 +24,6 @@
class WXDLLEXPORT wxMenu;
-class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxPoint;
+class WXDLLEXPORT wxSize;
// abstraction of the folder tree control for M usage
Index: wxFolderView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxFolderView.h,v
retrieving revision 1.143
retrieving revision 1.144
diff -b -u -2 -r1.143 -r1.144
--- wxFolderView.h 22 Jul 2003 22:01:38 -0000 1.143
+++ wxFolderView.h 18 Sep 2003 16:30:44 -0000 1.144
@@ -18,6 +18,9 @@
#endif
-#include "Mdefaults.h"
-#include "wxMFrame.h"
+#ifndef USE_PCH
+# include "Mdefaults.h"
+# include "gui/wxMFrame.h"
+#endif // USE_PCH
+
#include "FolderView.h"
#include "MEvent.h"
Index: wxIconManager.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxIconManager.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -b -u -2 -r1.29 -r1.30
--- wxIconManager.h 23 Jun 2003 01:23:45 -0000 1.29
+++ wxIconManager.h 18 Sep 2003 16:30:44 -0000 1.30
@@ -15,7 +15,7 @@
#ifndef USE_PCH
-# include <wx/icon.h>
-# include <Mcommon.h>
# include "kbList.h"
+
+# include <wx/icon.h>
#endif //USE_PCH
Index: wxMDialogs.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMDialogs.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -b -u -2 -r1.108 -r1.109
--- wxMDialogs.h 22 Jul 2003 22:01:38 -0000 1.108
+++ wxMDialogs.h 18 Sep 2003 16:30:44 -0000 1.109
@@ -15,17 +15,13 @@
#ifndef USE_PCH
-# include "Mcommon.h"
-# include "Mdefaults.h"
-# include "guidef.h"
-# include "MFrame.h"
# include "gui/wxIconManager.h"
# include "MApplication.h"
-#endif
-#include <wx/icon.h>
-#include <wx/frame.h>
+# include <wx/bmpbuttn.h>
+#endif // USE_PCH
+
+#include "MDialogs.h"
+
#include <wx/progdlg.h>
-#include <wx/dialog.h>
-#include <wx/bmpbuttn.h>
// fwd decl
Index: wxMFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMFrame.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -b -u -2 -r1.41 -r1.42
--- wxMFrame.h 22 Jul 2003 22:01:38 -0000 1.41
+++ wxMFrame.h 18 Sep 2003 16:30:44 -0000 1.42
@@ -23,4 +23,6 @@
#endif
+#include <wx/frame.h>
+
// enable workaround broken maximize?
#if defined(__WXMSW__) && !wxCHECK_VERSION(2, 3, 0)
Index: wxMainFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMainFrame.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -b -u -2 -r1.42 -r1.43
--- wxMainFrame.h 22 Jul 2003 22:01:38 -0000 1.42
+++ wxMainFrame.h 18 Sep 2003 16:30:44 -0000 1.43
@@ -17,7 +17,10 @@
#endif
+#ifndef USE_PCH
+# include "gui/wxMFrame.h"
+#endif // USE_PCH
+
#include "MMainFrame.h"
#include "gui/wxMenuDefs.h"
-#include "gui/wxMFrame.h"
#include "MEvent.h"
Index: wxMessageView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMessageView.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -b -u -2 -r1.88 -r1.89
--- wxMessageView.h 14 Sep 2003 14:10:11 -0000 1.88
+++ wxMessageView.h 18 Sep 2003 16:30:44 -0000 1.89
@@ -19,17 +19,17 @@
#endif
-class FolderView;
-class MsgCmdProc;
-
-#include "FolderType.h"
-#include "MessageView.h"
-
#ifndef USE_PCH
# include "gui/wxMFrame.h"
+# include "FolderType.h"
# include <wx/dynarray.h>
-#endif
+#endif // USE_PCH
#include <wx/process.h>
+
+#include "MessageView.h"
+
+class FolderView;
+class MsgCmdProc;
// ----------------------------------------------------------------------------
Index: wxOptionsDlg.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxOptionsDlg.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -b -u -2 -r1.23 -r1.24
--- wxOptionsDlg.h 22 Aug 2003 22:22:19 -0000 1.23
+++ wxOptionsDlg.h 18 Sep 2003 16:30:44 -0000 1.24
@@ -20,4 +20,5 @@
class wxFrame;
struct wxOptionsPageDesc;
+class Profile;
// -----------------------------------------------------------------------------
Index: wxOptionsPage.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxOptionsPage.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -b -u -2 -r1.60 -r1.61
--- wxOptionsPage.h 14 Sep 2003 14:32:10 -0000 1.60
+++ wxOptionsPage.h 18 Sep 2003 16:30:44 -0000 1.61
@@ -18,7 +18,7 @@
# include <wx/control.h>
# include <wx/dynarray.h>
-#endif
+#endif // USE_PCH
-#include "gui/wxDialogLayout.h"
+#include "gui/wxDialogLayout.h" // for wxNotebookPageBase
WX_DEFINE_ARRAY(wxControl *, ArrayControls);
Index: wxllist.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxllist.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -b -u -2 -r1.80 -r1.81
--- wxllist.h 22 Jul 2003 22:01:38 -0000 1.80
+++ wxllist.h 18 Sep 2003 16:30:44 -0000 1.81
@@ -15,7 +15,8 @@
#endif
-#include "kbList.h"
+#ifndef USE_PCH
+# include "kbList.h"
+#endif // USE_PCH
-#include <wx/wx.h>
#include <wx/print.h>
#include <wx/printdlg.h>
Index: wxlparser.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxlparser.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -b -u -2 -r1.26 -r1.27
--- wxlparser.h 13 Jan 2001 22:07:34 -0000 1.26
+++ wxlparser.h 18 Sep 2003 16:30:45 -0000 1.27
@@ -15,4 +15,6 @@
#include <wx/fontenc.h> // enum wxFontEncoding declaration
+#include "gui/wxllist.h"
+
#ifndef NULL
# define NULL 0
Index: wxlwindow.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxlwindow.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -b -u -2 -r1.51 -r1.52
--- wxlwindow.h 22 Jul 2003 22:01:38 -0000 1.51
+++ wxlwindow.h 18 Sep 2003 16:30:45 -0000 1.52
@@ -13,9 +13,5 @@
#endif
-#ifndef USE_PCH
-# include <wx/wx.h>
-#endif
-
-#include "wxllist.h"
+#include "gui/wxllist.h"
#ifndef WXLOWIN_MENU_FIRST
-------------------------------------------------------
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
