Update of /cvsroot/mahogany/M/include
In directory sc8-pr-cvs1:/tmp/cvs-serv29729/include
Modified Files:
ASMailFolder.h AttachDialog.h ClickAtt.h ClickInfo.h
ClickURL.h ConfigSource.h FolderType.h HeaderInfo.h
HeaderInfoImpl.h MApplication.h MDialogs.h MFCache.h MFilter.h
MFolder.h MGuiApp.h MImport.h MInterface.mid MLogFrame.h
MMainFrame.h MModule.h MTextStyle.h MailFolder.h
MailFolderCC.h MailFolderCmn.h Mdefaults.h Mdnd.h Message.h
MessageCC.h MessageEditor.h MessageView.h MessageViewer.h
MimePart.h Profile.h SendMessage.h SendMessageCC.h Sorting.h
Threading.h UIdArray.h guidef.h miscutil.h strutil.h sysutil.h
Log Message:
Include dependencies cleanup, stage two (final so far)
Index: ASMailFolder.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/ASMailFolder.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -b -u -2 -r1.58 -r1.59
--- ASMailFolder.h 28 Dec 2002 02:28:32 -0000 1.58
+++ ASMailFolder.h 18 Sep 2003 16:30:38 -0000 1.59
@@ -19,6 +19,4 @@
#endif
-#include "FolderType.h"
-
// forward declarations
Index: AttachDialog.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/AttachDialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -u -2 -r1.1 -r1.2
--- AttachDialog.h 2 Sep 2002 18:40:35 -0000 1.1
+++ AttachDialog.h 18 Sep 2003 16:30:39 -0000 1.2
@@ -16,4 +16,6 @@
#include "MimeType.h"
+class wxWindow;
+
/// AttachmentProperties: the structure describing all attachment properties
struct AttachmentProperties
Index: ClickAtt.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/ClickAtt.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -2 -r1.2 -r1.3
--- ClickAtt.h 22 Jul 2003 22:01:38 -0000 1.2
+++ ClickAtt.h 18 Sep 2003 16:30:39 -0000 1.3
@@ -17,4 +17,9 @@
#include "ClickInfo.h"
+class MessageView;
+class MimePart;
+
+class WXDLLEXPORT wxWindow;
+
class ClickableAttachment : public ClickableInfo
{
Index: ClickInfo.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/ClickInfo.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -2 -r1.2 -r1.3
--- ClickInfo.h 22 Jul 2003 22:01:38 -0000 1.2
+++ ClickInfo.h 18 Sep 2003 16:30:39 -0000 1.3
@@ -16,4 +16,5 @@
class MessageView;
+class wxPoint;
// ----------------------------------------------------------------------------
Index: ClickURL.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/ClickURL.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -2 -r1.2 -r1.3
--- ClickURL.h 22 Jul 2003 22:01:38 -0000 1.2
+++ ClickURL.h 18 Sep 2003 16:30:39 -0000 1.3
@@ -18,4 +18,6 @@
class MessageView;
+class wxPoint;
+class Profile;
/// options for OpenInBrowser() (these are bit masks)
Index: ConfigSource.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/ConfigSource.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -2 -r1.5 -r1.6
--- ConfigSource.h 29 Aug 2003 00:06:41 -0000 1.5
+++ ConfigSource.h 18 Sep 2003 16:30:39 -0000 1.6
@@ -39,5 +39,5 @@
#endif
-#include "MObject.h"
+#include "MObject.h" // for MObjectRC
#include "MModule.h"
Index: FolderType.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/FolderType.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -b -u -2 -r1.58 -r1.59
--- FolderType.h 8 Mar 2003 10:40:27 -0000 1.58
+++ FolderType.h 18 Sep 2003 16:30:39 -0000 1.59
@@ -14,9 +14,5 @@
#define _FOLDERTYPE_H
-#include "Mcommon.h"
-
#include <wx/setup.h> // for wxSIZE_T_IS_ULONG/UINT
-
-#include <limits.h>
// ----------------------------------------------------------------------------
Index: HeaderInfo.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/HeaderInfo.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -b -u -2 -r1.29 -r1.30
--- HeaderInfo.h 30 Mar 2003 17:01:23 -0000 1.29
+++ HeaderInfo.h 18 Sep 2003 16:30:39 -0000 1.30
@@ -20,5 +20,5 @@
#endif
-#include <wx/fontenc.h>
+#include <wx/fontenc.h> // for wxFontEncoding
#include "MailFolder.h" // for MailFolder::MessageStatus
Index: HeaderInfoImpl.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/HeaderInfoImpl.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -b -u -2 -r1.44 -r1.45
--- HeaderInfoImpl.h 30 Mar 2003 17:01:25 -0000 1.44
+++ HeaderInfoImpl.h 18 Sep 2003 16:30:39 -0000 1.45
@@ -22,9 +22,9 @@
#include "Sorting.h"
#include "Threading.h"
+
+ #include <wx/dynarray.h> // for WX_DEFINE_ARRAY
#endif // USE_PCH
#include "HeaderInfo.h"
-
-#include <wx/dynarray.h>
WX_DEFINE_ARRAY(HeaderInfo *, ArrayHeaderInfo);
Index: MApplication.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MApplication.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -b -u -2 -r1.102 -r1.103
--- MApplication.h 16 Jul 2003 08:30:07 -0000 1.102
+++ MApplication.h 18 Sep 2003 16:30:39 -0000 1.103
@@ -15,20 +15,7 @@
#ifndef USE_PCH
-# include "Mcommon.h"
# include "Merror.h"
-# include "Mdefaults.h"
-
-# include "kbList.h"
-# include "PathFinder.h"
-# include "Profile.h"
-
-# include "guidef.h"
-# include "MFrame.h"
# include "gui/wxMFrame.h"
-# include "MLogFrame.h"
-# include "FolderType.h"
-
-# include <wx/cmndata.h> // wxPageSetupDialogData
-#endif
+#endif // USE_PCH
#include "MEvent.h"
@@ -45,4 +32,5 @@
class WXDLLEXPORT wxPageSetupDialogData;
class WXDLLEXPORT wxPrintData;
+class WXDLLEXPORT wxConfigBase;
M_LIST_PTR(ListLibraries, wxDynamicLibrary);
Index: MDialogs.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MDialogs.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- MDialogs.h 12 Apr 2001 17:08:00 -0000 1.9
+++ MDialogs.h 18 Sep 2003 16:30:39 -0000 1.10
@@ -30,5 +30,3 @@
//@}
-#include "gui/wxMDialogs.h"
-
#endif
Index: MFCache.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MFCache.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -u -2 -r1.14 -r1.15
--- MFCache.h 22 Jul 2003 22:01:38 -0000 1.14
+++ MFCache.h 18 Sep 2003 16:30:39 -0000 1.15
@@ -18,11 +18,11 @@
#endif
-#include "MFStatus.h"
+#ifndef USE_PCH
+# include <wx/dynarray.h> // for WX_DEFINE_ARRAY
+#endif // USE_PCH
#include "CacheFile.h" // base class
#include "MEvent.h"
-
-#include <wx/dynarray.h>
WX_DEFINE_ARRAY(MailFolderStatus *, MfStatusArray);
Index: MFilter.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MFilter.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -u -2 -r1.18 -r1.19
--- MFilter.h 15 Sep 2003 17:01:36 -0000 1.18
+++ MFilter.h 18 Sep 2003 16:30:39 -0000 1.19
@@ -16,7 +16,7 @@
#ifndef USE_PCH
# include "Profile.h"
-#endif
+#endif // USE_PCH
-#include "MObject.h"
+#include "MObject.h" // for MObjectRC
class WXDLLEXPORT wxWindow;
Index: MFolder.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MFolder.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -b -u -2 -r1.59 -r1.60
--- MFolder.h 22 Jul 2003 22:01:38 -0000 1.59
+++ MFolder.h 18 Sep 2003 16:30:40 -0000 1.60
@@ -18,12 +18,12 @@
#endif
-#include "Mdefaults.h"
-
#ifndef USE_PCH
-# include "Profile.h"
-# include "MailFolder.h"
-# include "MObject.h"
# include "FolderType.h"
-#endif
+# include "Profile.h"
+#endif // USE_PCH
+
+#include "MObject.h" // for MObjectRC
+
+class Profile;
/** A class representing a folder used by M. The folders are organized in a tree
Index: MGuiApp.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MGuiApp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -2 -r1.2 -r1.3
--- MGuiApp.h 25 Jul 1998 20:08:33 -0000 1.2
+++ MGuiApp.h 18 Sep 2003 16:30:40 -0000 1.3
@@ -11,6 +11,4 @@
#define MGUIAPP_H
-#include "Mcommon.h"
-
/**
GUI Application class, defining the interface to the real GUI
Index: MImport.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MImport.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -2 -r1.6 -r1.7
--- MImport.h 13 Sep 2002 01:27:46 -0000 1.6
+++ MImport.h 18 Sep 2003 16:30:40 -0000 1.7
@@ -24,4 +24,7 @@
#include "MModule.h" // the base class
+class MFolder;
+class WXDLLEXPORT wxWindow;
+
// ----------------------------------------------------------------------------
// constants
Index: MInterface.mid
===================================================================
RCS file: /cvsroot/mahogany/M/include/MInterface.mid,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -u -2 -r1.33 -r1.34
--- MInterface.mid 15 Jul 2002 16:31:42 -0000 1.33
+++ MInterface.mid 18 Sep 2003 16:30:40 -0000 1.34
@@ -11,5 +11,5 @@
INCLUDE(`"Profile.h"')
INCLUDE(`"strutil.h"')
-INCLUDE(`"MDialogs.h"')
+INCLUDE(`"gui/wxMDialogs.h"')
INCLUDE(`"MFolder.h"')
INCLUDE(`"MailFolder.h"')
Index: MLogFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MLogFrame.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- MLogFrame.h 13 Sep 2002 01:27:46 -0000 1.9
+++ MLogFrame.h 18 Sep 2003 16:30:40 -0000 1.10
@@ -10,6 +10,4 @@
#define MLOGFRAME_H
-#include "Mconfig.h"
-
/**
MLogFrameBase virtual base class, defining the interface for a
Index: MMainFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MMainFrame.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- MMainFrame.h 8 Oct 2002 16:13:12 -0000 1.10
+++ MMainFrame.h 18 Sep 2003 16:30:40 -0000 1.11
@@ -18,5 +18,7 @@
*/
-#include "MFrame.h"
+#ifndef USE_PCH
+# include "MFrame.h"
+#endif // USE_PCH
class MainFrameBase : public MFrameBase
Index: MModule.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MModule.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -b -u -2 -r1.54 -r1.55
--- MModule.h 27 Feb 2003 19:23:00 -0000 1.54
+++ MModule.h 18 Sep 2003 16:30:40 -0000 1.55
@@ -20,9 +20,11 @@
// ----------------------------------------------------------------------------
+#include "MObject.h"
+
class WXDLLEXPORT wxDynamicLibrary;
-#include "Mversion.h" // for M_VERSION_MAJOR &c
+class MInterface;
-#include "MInterface.h"
+#include "Mversion.h" // for M_VERSION_MAJOR &c
// ----------------------------------------------------------------------------
@@ -204,6 +206,5 @@
protected:
/// Removes the module from the global list
- virtual ~MModuleCommon()
- { if ( m_MInterface ) m_MInterface->RemoveModule(this); }
+ virtual ~MModuleCommon();
MInterface *m_MInterface;
Index: MTextStyle.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MTextStyle.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -2 -r1.2 -r1.3
--- MTextStyle.h 30 Nov 2002 22:26:39 -0000 1.2
+++ MTextStyle.h 18 Sep 2003 16:30:41 -0000 1.3
@@ -14,5 +14,7 @@
#define _MTEXTSTYLE_H_
-#include <wx/textctrl.h>
+#ifndef USE_PCH
+# include <wx/textctrl.h>
+#endif // USE_PCH
// use the standard wxWin class: even if it is not really intended for this, it
Index: MailFolder.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MailFolder.h,v
retrieving revision 1.188
retrieving revision 1.189
diff -b -u -2 -r1.188 -r1.189
--- MailFolder.h 11 Apr 2003 22:28:44 -0000 1.188
+++ MailFolder.h 18 Sep 2003 16:30:41 -0000 1.189
@@ -18,8 +18,11 @@
#endif
+#ifndef USE_PCH
+# include "FolderType.h"
+#endif // USE_PCH
+
#include "MObject.h"
-#include "FolderType.h"
-#include <wx/fontenc.h>
+#include <wx/fontenc.h> // for wxFontEncoding
// forward declarations
Index: MailFolderCC.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MailFolderCC.h,v
retrieving revision 1.214
retrieving revision 1.215
diff -b -u -2 -r1.214 -r1.215
--- MailFolderCC.h 11 Apr 2003 22:28:44 -0000 1.214
+++ MailFolderCC.h 18 Sep 2003 16:30:41 -0000 1.215
@@ -19,8 +19,6 @@
#ifndef USE_PCH
-# include "kbList.h"
-
# include "Mcclient.h"
-#endif
+#endif // USE_PCH
#include "MThread.h"
@@ -29,7 +27,6 @@
#include "MailFolderCmn.h"
-#include "FolderView.h"
-#include <wx/fontenc.h> // enum wxFontEncoding can't be fwd declared
+#include <wx/fontenc.h> // for wxFontEncoding
// fwd decls
Index: MailFolderCmn.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MailFolderCmn.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -b -u -2 -r1.81 -r1.82
--- MailFolderCmn.h 11 Apr 2003 22:28:44 -0000 1.81
+++ MailFolderCmn.h 18 Sep 2003 16:30:41 -0000 1.82
@@ -20,12 +20,12 @@
#endif
-#include "MailFolder.h" // the base class
+#include "MailFolder.h" // for MailFolder
#ifndef USE_PCH
-# include "MEvent.h" // for MEventOptionsChangeData
-
# include "Sorting.h"
# include "Threading.h"
#endif // USE_PCH
+
+#include "MEvent.h" // for MEventOptionsChangeData
// define this for some additional checks of folder closing logic
Index: Mdefaults.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Mdefaults.h,v
retrieving revision 1.257
retrieving revision 1.258
diff -b -u -2 -r1.257 -r1.258
--- Mdefaults.h 28 Dec 2002 02:28:33 -0000 1.257
+++ Mdefaults.h 18 Sep 2003 16:30:42 -0000 1.258
@@ -14,7 +14,5 @@
#define MDEFAULTS_H
-#include "Mcallbacks.h"
-#include "Mversion.h"
-#include "Profile.h"
+class Profile;
// under Windows 12pt font looks too huge, letters are like in a book for
Index: Mdnd.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Mdnd.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- Mdnd.h 22 Jul 2003 22:01:38 -0000 1.8
+++ Mdnd.h 18 Sep 2003 16:30:42 -0000 1.9
@@ -18,7 +18,10 @@
#endif
+#include "MailFolder.h"
+
#include <wx/dnd.h>
class MsgCmdProc;
+class MailFolder;
/// the clipboard/dnd format for Mahogany messages
Index: Message.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Message.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -b -u -2 -r1.66 -r1.67
--- Message.h 13 Sep 2002 01:27:46 -0000 1.66
+++ Message.h 18 Sep 2003 16:30:42 -0000 1.67
@@ -22,5 +22,7 @@
#include "MimePart.h"
-#include "FolderType.h" // for Protocol enum
+#ifndef USE_PCH
+# include "FolderType.h" // for Protocol enum
+#endif // USE_PCH
class WXDLLEXPORT wxArrayString;
Index: MessageCC.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageCC.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -b -u -2 -r1.56 -r1.57
--- MessageCC.h 12 Jul 2003 18:57:43 -0000 1.56
+++ MessageCC.h 18 Sep 2003 16:30:42 -0000 1.57
@@ -18,4 +18,9 @@
#endif
+#ifndef USE_PCH
+# include "Mcclient.h" // for ADDRESS
+#endif //USE_PCH
+
+#include "MailFolderCC.h"
#include "Message.h"
@@ -23,4 +28,5 @@
class MailFolderCC;
class MimePartCC;
+class HeaderInfo;
/** Message class, containing the most commonly used message headers.
@@ -264,3 +270,2 @@
#endif // _MESSAGECC_H
-
Index: MessageEditor.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageEditor.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- MessageEditor.h 22 Aug 2003 13:03:50 -0000 1.10
+++ MessageEditor.h 18 Sep 2003 16:30:42 -0000 1.11
@@ -21,9 +21,10 @@
class EditorContentPart;
-#include <wx/fontenc.h>
+#include <wx/fontenc.h> // for wxFontEncoding
#include "MimePart.h" // for MimeType
#include "MModule.h"
+#include "Composer.h"
// the message editor module interface name
Index: MessageView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageView.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -b -u -2 -r1.47 -r1.48
--- MessageView.h 14 Sep 2003 14:10:11 -0000 1.47
+++ MessageView.h 18 Sep 2003 16:30:42 -0000 1.48
@@ -20,8 +20,8 @@
#ifndef USE_PCH
- #include <wx/dynarray.h>
- #include <wx/font.h>
-#endif
+ #include <wx/dynarray.h> // for WX_DEFINE_ARRAY
+#endif // USE_PCH
+#include <wx/font.h> // for wxFont
#include <wx/colour.h>
Index: MessageViewer.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MessageViewer.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -u -2 -r1.18 -r1.19
--- MessageViewer.h 22 Jul 2003 22:01:38 -0000 1.18
+++ MessageViewer.h 18 Sep 2003 16:30:42 -0000 1.19
@@ -18,9 +18,10 @@
class WXDLLEXPORT wxTextAttr;
class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxImage;
class ClickableInfo;
+class MTextStyle;
#include "MModule.h"
-#include "MTextStyle.h"
#include "MessageView.h" // we use MessageView in inline funcs below
Index: MimePart.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/MimePart.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- MimePart.h 12 Jul 2003 18:57:43 -0000 1.10
+++ MimePart.h 18 Sep 2003 16:30:42 -0000 1.11
@@ -17,6 +17,5 @@
#define _MIMEPART_H_
-// for wxFontEncoding enum
-#include <wx/fontenc.h>
+#include <wx/fontenc.h> // for wxFontEncoding
// for MimeParameterList
Index: Profile.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Profile.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -b -u -2 -r1.81 -r1.82
--- Profile.h 30 Aug 2003 23:47:47 -0000 1.81
+++ Profile.h 18 Sep 2003 16:30:42 -0000 1.82
@@ -18,6 +18,4 @@
#endif
-#include <wx/confbase.h>
-
// ----------------------------------------------------------------------------
// headers
Index: SendMessage.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/SendMessage.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- SendMessage.h 28 Dec 2002 02:28:33 -0000 1.12
+++ SendMessage.h 18 Sep 2003 16:30:43 -0000 1.13
@@ -14,4 +14,11 @@
#define SENDMESSAGE_H
+#ifndef USE_PCH
+# include "FolderType.h"
+#endif // USE_PCH
+
+#include "MimePart.h"
+#include "MObject.h"
+
class Message;
class Profile;
Index: SendMessageCC.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/SendMessageCC.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -b -u -2 -r1.54 -r1.55
--- SendMessageCC.h 8 Mar 2003 16:18:40 -0000 1.54
+++ SendMessageCC.h 18 Sep 2003 16:30:43 -0000 1.55
@@ -18,7 +18,10 @@
#endif
-#include "lists.h"
+#ifndef USE_PCH
+# include "Mcclient.h"
+#endif //USE_PCH
-#include "FolderType.h"
+#include "lists.h"
+#include "SendMessage.h"
class Profile;
Index: Sorting.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Sorting.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -u -2 -r1.4 -r1.5
--- Sorting.h 6 Sep 2001 20:09:47 -0000 1.4
+++ Sorting.h 18 Sep 2003 16:30:43 -0000 1.5
@@ -18,5 +18,7 @@
#endif
-#include <wx/dynarray.h> // for wxArrayInt
+#ifndef USE_PCH
+# include <wx/dynarray.h> // for wxArrayInt
+#endif // USE_PCH
class Profile;
Index: Threading.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/Threading.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- Threading.h 15 Sep 2003 17:01:36 -0000 1.7
+++ Threading.h 18 Sep 2003 16:30:43 -0000 1.8
@@ -19,5 +19,4 @@
#ifndef USE_PCH
- #include "Message.h"
#endif // USE_PCH
Index: UIdArray.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/UIdArray.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -u -2 -r1.1 -r1.2
--- UIdArray.h 4 Jul 2002 17:22:36 -0000 1.1
+++ UIdArray.h 18 Sep 2003 16:30:43 -0000 1.2
@@ -20,5 +20,9 @@
We use wxArrayInt to implement it.
*/
-#include <wx/dynarray.h>
+
+#ifndef USE_PCH
+# include <wx/dynarray.h> // for WX_DEFINE_ARRAY_INT
+#endif // USE_PCH
+
WX_DEFINE_ARRAY_INT(UIdType, UIdArray);
Index: guidef.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/guidef.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -b -u -2 -r1.23 -r1.24
--- guidef.h 14 Sep 2003 16:10:44 -0000 1.23
+++ guidef.h 18 Sep 2003 16:30:43 -0000 1.24
@@ -11,12 +11,9 @@
#define GUIDEF_H
-#include <wx/defs.h>
-#include <wx/frame.h>
-#include <wx/button.h>
-#include <wx/filefn.h>
-#include <wx/filedlg.h>
-#include <wx/textctrl.h> // wxBrowsebutton
+#ifndef USE_PCH
+# include <wx/frame.h>
+#endif // USE_PCH
-#include "gui/wxMenuDefs.h"
+class WXDLLEXPORT wxClassInfo;
/// how much space to leave in frame around other items
Index: miscutil.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/miscutil.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -u -2 -r1.17 -r1.18
--- miscutil.h 26 Apr 2002 13:15:05 -0000 1.17
+++ miscutil.h 18 Sep 2003 16:30:43 -0000 1.18
@@ -13,7 +13,4 @@
#ifndef USE_PCH
-# include "Mconfig.h"
-# include "FolderType.h"
-# include "Profile.h"
#endif
Index: strutil.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/strutil.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -b -u -2 -r1.61 -r1.62
--- strutil.h 1 Sep 2003 15:35:31 -0000 1.61
+++ strutil.h 18 Sep 2003 16:30:43 -0000 1.62
@@ -13,8 +13,7 @@
#ifndef USE_PCH
-# include "Mconfig.h"
#endif
-#include <time.h>
+#include <time.h> // for time_t
#include "FolderType.h" // for strutil_expandfoldername
Index: sysutil.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/sysutil.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -u -2 -r1.9 -r1.10
--- sysutil.h 14 Oct 2002 23:23:58 -0000 1.9
+++ sysutil.h 18 Sep 2003 16:30:43 -0000 1.10
@@ -13,6 +13,5 @@
#ifndef USE_PCH
-# include "Mconfig.h"
-#endif
+#endif // USE_PCH
#include <wx/filename.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
