CVS: M/src/gui ClickURL.cpp, 1.26, 1.27 wxComposeView.cpp, 1.418, 1.419 wxDialogLayout.cpp, 1.124, 1.125 wxFolderView.cpp, 1.683, 1.684 wxMApp.cpp, 1.309, 1.310 wxMDialogs.cpp, 1.435, 1.436 wxMFrame.cpp, 1.178, 1.179 wxSortDialog.cpp, 1.17, 1.18 wxllist.cpp, 1.170, 1.171

Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3563/src/gui

Modified Files:
	ClickURL.cpp wxComposeView.cpp wxDialogLayout.cpp 
	wxFolderView.cpp wxMApp.cpp wxMDialogs.cpp wxMFrame.cpp 
	wxSortDialog.cpp wxllist.cpp 
Log Message:
compilation with wxWine

Index: ClickURL.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/ClickURL.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -b -u -2 -r1.26 -r1.27
--- ClickURL.cpp	31 Aug 2006 17:59:27 -0000	1.26
+++ ClickURL.cpp	4 Sep 2006 23:15:35 -0000	1.27
@@ -442,5 +442,5 @@
       else // easy case: open in the same window
       {
-#if !defined(__CYGWIN__) && !defined(__MINGW32__) // FIXME ShellExecute() is defined in <w32api/shellapi.h>, how to include it?
+#if !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__WINE__) // FIXME ShellExecute() is defined in <w32api/shellapi.h>, how to include it?
          bOk = (int)ShellExecute(NULL, "open", m_url,
                                  NULL, NULL, SW_SHOWNORMAL ) > 32;

Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.418
retrieving revision 1.419
diff -b -u -2 -r1.418 -r1.419
--- wxComposeView.cpp	25 Aug 2006 13:25:48 -0000	1.418
+++ wxComposeView.cpp	4 Sep 2006 23:15:35 -0000	1.419
@@ -72,4 +72,8 @@
 #include <wx/textbuf.h>
 #include <wx/fontmap.h>
+#ifdef __WINE__
+// it includes wrapwin.h which includes windows.h which defines SendMessage under Windows
+#undef SendMessage
+#endif // __WINE__
 #include <wx/fontutil.h>      // for wxNativeFontInfo
 

Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -b -u -2 -r1.124 -r1.125
--- wxDialogLayout.cpp	27 Jun 2006 00:31:06 -0000	1.124
+++ wxDialogLayout.cpp	4 Sep 2006 23:15:35 -0000	1.125
@@ -38,4 +38,9 @@
 #  include <wx/statbox.h>
 #  include <wx/statbmp.h>
+#ifdef __WINE__
+#  include <wx/scrolwin.h>  // for wxScrolledWindow
+#  include <wx/dcclient.h>  // for wxClientDC
+#  include <wx/settings.h>  // for wxSystemSettings
+#endif // __WINE__
 #endif // USE_PCH
 

Index: wxFolderView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFolderView.cpp,v
retrieving revision 1.683
retrieving revision 1.684
diff -b -u -2 -r1.683 -r1.684
--- wxFolderView.cpp	19 Aug 2006 13:12:00 -0000	1.683
+++ wxFolderView.cpp	4 Sep 2006 23:15:35 -0000	1.684
@@ -47,4 +47,7 @@
 #  include <wx/sizer.h>
 #  include <wx/accel.h>
+#ifdef __WINE__
+#  include <wx/timer.h>   // for wxTimerEvent
+#endif // __WINE__
 #endif // USE_PCH
 

Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.309
retrieving revision 1.310
diff -b -u -2 -r1.309 -r1.310
--- wxMApp.cpp	2 Sep 2006 12:41:30 -0000	1.309
+++ wxMApp.cpp	4 Sep 2006 23:15:35 -0000	1.310
@@ -35,4 +35,7 @@
 #  include <wx/menu.h>
 #  include <wx/statusbr.h>
+#ifdef __WINE__
+#  include <wx/timer.h>    // for wxTimer
+#endif // __WINE__
 #endif // USE_PCH
 
@@ -1383,5 +1386,5 @@
       m_PrintData = new wxPrintData;
 
-#if wxUSE_POSTSCRIPT
+#if wxUSE_POSTSCRIPT && !defined(__WINE__)
       wxPrintNativeDataBase * const dataNative = m_PrintData->GetNativeData();
       wxPostScriptPrintNativeData * const dataPS =

Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.435
retrieving revision 1.436
diff -b -u -2 -r1.435 -r1.436
--- wxMDialogs.cpp	25 Aug 2006 16:22:46 -0000	1.435
+++ wxMDialogs.cpp	4 Sep 2006 23:15:36 -0000	1.436
@@ -43,4 +43,10 @@
 #  include <wx/choicdlg.h>
 #  include <wx/filedlg.h>
+#ifdef __WINE__
+#  include <wx/dcclient.h>  // for wxClientDC
+#  include <wx/settings.h>  // for wxSystemSettings
+#  include <wx/stattext.h>  // for wxStaticText
+#  include <wx/timer.h>     // for wxTimer
+#endif // __WINE__
 #endif // USE_PCH
 

Index: wxMFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFrame.cpp,v
retrieving revision 1.178
retrieving revision 1.179
diff -b -u -2 -r1.178 -r1.179
--- wxMFrame.cpp	8 Apr 2006 00:35:31 -0000	1.178
+++ wxMFrame.cpp	4 Sep 2006 23:15:36 -0000	1.179
@@ -61,4 +61,8 @@
 
 #include <wx/fontmap.h>          // for GetEncodingDescription()
+#ifdef __WINE__
+// it includes wrapwin.h which includes windows.h which defines CreateFile under Windows
+#undef CreateFile
+#endif // __WINE__
 #include <wx/confbase.h>
 

Index: wxSortDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxSortDialog.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -u -2 -r1.17 -r1.18
--- wxSortDialog.cpp	24 Jan 2005 18:36:22 -0000	1.17
+++ wxSortDialog.cpp	4 Sep 2006 23:15:36 -0000	1.18
@@ -31,5 +31,8 @@
 #ifdef OS_WIN // cygwin and mingw
    #include <wx/settings.h>
-#endif
+#ifdef __WINE__
+   #include <wx/dcclient.h>     // for wxClientDC
+#endif // __WINE__
+#endif // OS_WIN
 #endif // USE_PCH
 

Index: wxllist.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxllist.cpp,v
retrieving revision 1.170
retrieving revision 1.171
diff -b -u -2 -r1.170 -r1.171
--- wxllist.cpp	8 Apr 2006 17:00:11 -0000	1.170
+++ wxllist.cpp	4 Sep 2006 23:15:36 -0000	1.171
@@ -51,4 +51,7 @@
 #   include <wx/filefn.h>
 #   include <wx/msgdlg.h>
+#ifdef __WINE__
+#   include <wx/dcprint.h>       // for wxPrinterDC
+#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