Revision: 7136
http://svn.sourceforge.net/mahogany/?rev=7136&view=rev
Author: nerijus
Date: 2006-10-10 04:51:40 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
fixed unix compilation
Modified Paths:
--------------
trunk/M/src/gui/wxDialogLayout.cpp
trunk/M/src/gui/wxFolderView.cpp
trunk/M/src/gui/wxMApp.cpp
trunk/M/src/gui/wxMDialogs.cpp
trunk/M/src/gui/wxSortDialog.cpp
trunk/M/src/modules/BareBonesEditor.cpp
Modified: trunk/M/src/gui/wxDialogLayout.cpp
===================================================================
--- trunk/M/src/gui/wxDialogLayout.cpp 2006-10-02 18:33:20 UTC (rev 7135)
+++ trunk/M/src/gui/wxDialogLayout.cpp 2006-10-10 11:51:40 UTC (rev 7136)
@@ -37,10 +37,10 @@
# include <wx/stattext.h>
# include <wx/statbox.h>
# include <wx/statbmp.h>
+# include <wx/dcclient.h> // for wxClientDC
+# include <wx/settings.h> // for wxSystemSettings
#ifdef __WINE__
-# include <wx/scrolwin.h> // for wxScrolledWindow
-# include <wx/dcclient.h> // for wxClientDC
-# include <wx/settings.h> // for wxSystemSettings
+# include <wx/scrolwin.h> // for wxScrolledWindow
#endif // __WINE__
#endif // USE_PCH
Modified: trunk/M/src/gui/wxFolderView.cpp
===================================================================
--- trunk/M/src/gui/wxFolderView.cpp 2006-10-02 18:33:20 UTC (rev 7135)
+++ trunk/M/src/gui/wxFolderView.cpp 2006-10-10 11:51:40 UTC (rev 7136)
@@ -46,9 +46,7 @@
# include <wx/sizer.h>
# include <wx/accel.h>
-#ifdef __WINE__
-# include <wx/timer.h> // for wxTimerEvent
-#endif // __WINE__
+# include <wx/timer.h> // for wxTimerEvent
#endif // USE_PCH
#include <ctype.h>
Modified: trunk/M/src/gui/wxMApp.cpp
===================================================================
--- trunk/M/src/gui/wxMApp.cpp 2006-10-02 18:33:20 UTC (rev 7135)
+++ trunk/M/src/gui/wxMApp.cpp 2006-10-10 11:51:40 UTC (rev 7136)
@@ -31,19 +31,17 @@
# include "Mdefaults.h"
# include "Profile.h"
-# include <wx/msgdlg.h> // for wxMessageBox
+# include <wx/msgdlg.h> // for wxMessageBox
# include <wx/menu.h>
# include <wx/statusbr.h>
-#ifdef __WINE__
-# include <wx/timer.h> // for wxTimer
-#endif // __WINE__
+# include <wx/timer.h> // for wxTimer
#endif // USE_PCH
-#include "wx/persctrl.h" // for wxPMessageBoxEnable
+#include "wx/persctrl.h" // for wxPMessageBoxEnable
#include <wx/ffile.h>
#include <wx/fs_mem.h>
#include <wx/cmdline.h>
-#include <wx/encconv.h> // for wxEncodingConverter
+#include <wx/encconv.h> // for wxEncodingConverter
#ifdef USE_DIALUP
# include <wx/dialup.h>
Modified: trunk/M/src/gui/wxMDialogs.cpp
===================================================================
--- trunk/M/src/gui/wxMDialogs.cpp 2006-10-02 18:33:20 UTC (rev 7135)
+++ trunk/M/src/gui/wxMDialogs.cpp 2006-10-10 11:51:40 UTC (rev 7136)
@@ -42,11 +42,11 @@
# include <wx/msgdlg.h>
# include <wx/choicdlg.h>
# include <wx/filedlg.h>
-#ifdef __WINE__
# include <wx/dcclient.h> // for wxClientDC
# include <wx/settings.h> // for wxSystemSettings
+# include <wx/timer.h> // for wxTimer
+#ifdef __WINE__
# include <wx/stattext.h> // for wxStaticText
-# include <wx/timer.h> // for wxTimer
#endif // __WINE__
#endif // USE_PCH
Modified: trunk/M/src/gui/wxSortDialog.cpp
===================================================================
--- trunk/M/src/gui/wxSortDialog.cpp 2006-10-02 18:33:20 UTC (rev 7135)
+++ trunk/M/src/gui/wxSortDialog.cpp 2006-10-10 11:51:40 UTC (rev 7136)
@@ -28,12 +28,8 @@
#include <wx/layout.h>
#include <wx/stattext.h> // for wxStaticText
#include <wx/statbox.h>
-#ifdef OS_WIN // cygwin and mingw
- #include <wx/settings.h>
-#ifdef __WINE__
#include <wx/dcclient.h> // for wxClientDC
-#endif // __WINE__
-#endif // OS_WIN
+ #include <wx/settings.h> // for wxSystemSettings
#endif // USE_PCH
#include "gui/wxDialogLayout.h"
Modified: trunk/M/src/modules/BareBonesEditor.cpp
===================================================================
--- trunk/M/src/modules/BareBonesEditor.cpp 2006-10-02 18:33:20 UTC (rev
7135)
+++ trunk/M/src/modules/BareBonesEditor.cpp 2006-10-10 11:51:40 UTC (rev
7136)
@@ -30,6 +30,7 @@
# include <wx/sizer.h>
# include <wx/textctrl.h>
# include <wx/button.h> // for wxButton
+# include <wx/panel.h> // for wxPanel
#endif // USE_PCH
#include <wx/imaglist.h> // for wxImageList
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
