thread updates

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

src/os2/checkbox.cpp

@@ -207,7 +207,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
 
     checkWidth = -1 ;
     checkHeight = -1 ;
-    long msStyle = CHECK_FLAGS;
+//    long msStyle = CHECK_FLAGS;
 
     HWND wx_button = 0; // TODO: Create the bitmap checkbox
 

src/os2/clipbrd.cpp

@@ -37,10 +37,6 @@
 
 #include <string.h>
 
-#define INCL_DOS
-#define INCL_PM
-#include <os2.h>
-
 #include "wx/os2/private.h"
 
 // wxDataObject is tied to OLE/drag and drop implementation,

src/os2/dnd.cpp

@@ -14,6 +14,7 @@
 #endif
 
 #define INCL_PM
+#define INCL_DOS
 #include <os2.h>
 #include "wx/window.h"
 #include "wx/app.h"

src/os2/joystick.cpp

@@ -11,7 +11,7 @@
 
 #include "wx/string.h"
 #define INCL_PM
-#include "os2.h"
+#define INCL_DOS
 #include "wx/os2/private.h"
 
 #define NO_JOYGETPOSEX

src/os2/pnghand.cpp

@@ -22,13 +22,13 @@
 #   include <fstream>
 #endif
 
-#define INCL_DOS
-#define INCL_PM
-#define INCL_GPI
-#include <os2.h>
 #include "wx/palette.h"
 #include "wx/bitmap.h"
 #include "wx/utils.h"
+
+#define INCL_PM
+#include <os2.h>
+
 #include "wx/os2/pngread.h"
 
 extern "C" {

src/os2/thread.cpp

@@ -239,6 +239,28 @@ void wxCondition::Broadcast()
     }
 }
 
+// ----------------------------------------------------------------------------
+// wxCriticalSection implementation
+// ----------------------------------------------------------------------------
+
+wxCriticalSection::wxCriticalSection()
+{
+}
+
+wxCriticalSection::~wxCriticalSection()
+{
+}
+
+void wxCriticalSection::Enter()
+{
+    ::DosEnterCritSec();
+}
+
+void wxCriticalSection::Leave()
+{
+    ::DosExitCritSec();
+}
+
 // ----------------------------------------------------------------------------
 // wxThread implementation
 // ----------------------------------------------------------------------------

src/os2/timer.cpp

@@ -31,7 +31,6 @@
 #include <sys/types.h>
 
 #include <sys/timeb.h>
-
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------

src/os2/utils.cpp

@@ -738,12 +738,16 @@ void wxDisplaySize(
 {
     HPS                             hpsScreen;
     HDC                             hdcScreen;
+    LONG                            lWidth;
+    LONG                            lHeight;
 
     hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
     hdcScreen = ::GpiQueryDevice(hpsScreen);
-    ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, (PLONG)pWidth);
+    ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, &lWidth);
-    ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, (PLONG)pHeight);
+    ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, &lHeight);
     DevCloseDC(hdcScreen);
+    *pWidth = (int)lWidth;
+    *pHeight = (int)lHeight;
 }
 
 bool wxDirExists(

src/os2/utilsexc.cpp

@@ -25,10 +25,6 @@
 
 #include "wx/os2/private.h"
 
-#define INCL_DOSPROCESS
-#define INCL_DOSERRORS
-#define INCL_DOS
-#include <os2.h>
 #define PURE_32
 #include <upm.h>
 #include <netcons.h>

src/os2/wave.cpp

@@ -20,9 +20,6 @@
 #include "wx/os2/wave.h"
 #include "wx/os2/private.h"
 
-#define INCL_DOS
-#define INCL_PM
-#include <os2.h>
 #ifdef RECT
     #undef RECT
 #endif