Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3563/src/classes
Modified Files:
MApplication.cpp MModule.cpp MessageView.cpp PathFinder.cpp
Profile.cpp
Log Message:
compilation with wxWine
Index: MApplication.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MApplication.cpp,v
retrieving revision 1.303
retrieving revision 1.304
diff -b -u -2 -r1.303 -r1.304
--- MApplication.cpp 2 Jul 2006 12:23:13 -0000 1.303
+++ MApplication.cpp 4 Sep 2006 23:15:34 -0000 1.304
@@ -75,4 +75,9 @@
#include <wx/dynlib.h>
+#ifdef __WINE__
+ // it includes wrapwin.h which includes windows.h which defines SendMessage
under Windows
+ #undef SendMessage
+ #undef CreateFile
+#endif // __WINE__
#endif // OS_WIN
Index: MModule.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MModule.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -b -u -2 -r1.98 -r1.99
--- MModule.cpp 25 Aug 2006 15:59:30 -0000 1.98
+++ MModule.cpp 4 Sep 2006 23:15:34 -0000 1.99
@@ -39,4 +39,8 @@
#include <wx/dynlib.h>
+#ifdef __WINE__
+// it includes wrapwin.h which includes windows.h which defines SendMessage
under Windows
+#undef SendMessage
+#endif // __WINE__
#include <wx/textfile.h> // for wxTextFile
Index: MessageView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MessageView.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -b -u -2 -r1.175 -r1.176
--- MessageView.cpp 23 Aug 2006 15:41:53 -0000 1.175
+++ MessageView.cpp 4 Sep 2006 23:15:34 -0000 1.176
@@ -36,4 +36,8 @@
# include "gui/wxMApp.h" // for PrepareForPrinting()
+// windows.h defines ERROR
+#ifdef __WINE__
+# undef ERROR
+#endif // __WINE__
# include "MHelp.h"
# include "sysutil.h"
Index: PathFinder.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/PathFinder.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -2 -r1.25 -r1.26
--- PathFinder.cpp 16 Jan 2006 20:32:27 -0000 1.25
+++ PathFinder.cpp 4 Sep 2006 23:15:34 -0000 1.26
@@ -24,5 +24,5 @@
#endif // USE_PCH
-#ifdef OS_WIN // cygwin and mingw
+#if defined(OS_WIN) && !defined(__WINE__) // cygwin and mingw
# include <io.h> // for access()
#endif
Index: Profile.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Profile.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -b -u -2 -r1.170 -r1.171
--- Profile.cpp 8 Apr 2006 01:30:05 -0000 1.170
+++ Profile.cpp 4 Sep 2006 23:15:34 -0000 1.171
@@ -33,4 +33,7 @@
#include "Mdefaults.h"
#include <wx/fileconf.h> // for wxFileConfig
+#ifdef __WINE__
+ #include <wx/msw/regconf.h> // for wxRegConfig
+#endif // __WINE__
#endif // USE_PCH
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
