Various compilation fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/evtloop.cpp b/src/os2/evtloop.cpp
index 9399da2c82629d16e1222a975e62e8d4d163e035..4525143553750bee19667c0647d4936904e91b50 100644 (file)
--- a/src/os2/evtloop.cpp
+++ b/src/os2/evtloop.cpp
@@ -402,9 +402,10 @@ bool wxGUIEventLoop::YieldFor(long eventsToProcess)
     // If they are pending events, we must process them.
     //
     if (wxTheApp)
     // If they are pending events, we must process them.
     //
     if (wxTheApp)

+    {

         wxTheApp->ProcessPendingEvents();
         wxTheApp->ProcessPendingEvents();

-
-    HandleSockets();
+       wxTheApp->HandleSockets();
+    }

 
     //
     // Let the logs be flashed again
 
     //
     // Let the logs be flashed again

diff --git a/src/os2/filedlg.cpp b/src/os2/filedlg.cpp
index 24887d4bf5a065748ad1a6019e96313519ac336b..8fc737333e5972a4f08daabed74a2152f0cd26a0 100644 (file)
--- a/src/os2/filedlg.cpp
+++ b/src/os2/filedlg.cpp
@@ -23,6 +23,7 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"

+    #include "wx/filename.h"

     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/app.h"

diff --git a/src/os2/region.cpp b/src/os2/region.cpp
index 4e6760d6d7ec2b6118b64cb5a2d61b91a490d911..f84c63dde2e3e0a78a033bb77fe725f5239abc0b 100644 (file)
--- a/src/os2/region.cpp
+++ b/src/os2/region.cpp
@@ -221,7 +221,7 @@ wxRegion::wxRegion(const wxRect& rRect)
                                      );
 } // end of wxRegion::wxRegion
 
                                      );
 } // end of wxRegion::wxRegion
 

-wxRegion::wxRegion(size_t n, const wxPoint *points, int WXUNUSED(fillStyle))
+wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode WXUNUSED(fillStyle))

 {
     // TO DO
 }
 {
     // TO DO
 }