thread updates

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

diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp
index 84a6ab65ae7ceb8f699ef4b011a480f9f550b60c..56dde6f8f8b2ae7af2360b2b063004a6fea13082 100644 (file)
--- a/src/os2/checkbox.cpp
+++ b/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
 

diff --git a/src/os2/clipbrd.cpp b/src/os2/clipbrd.cpp
index 8ffa926849ca3fbfd5332ecf49b78d8500d1fa97..fc902957b47abe5835beda473bd4ba65758acb67 100644 (file)
--- a/src/os2/clipbrd.cpp
+++ b/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,

diff --git a/src/os2/dnd.cpp b/src/os2/dnd.cpp
index 452c5a2abcd1bb5a640bc6e823e8b5f7ac0a0475..f8ed534d5dd4784b34dc5add63f8494a5d000044 100644 (file)
--- a/src/os2/dnd.cpp
+++ b/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"

diff --git a/src/os2/joystick.cpp b/src/os2/joystick.cpp
index 5f20af8209c56c0fc783d0c5fc18173021943850..73e82b549b76ab4d4268924a5e2b7c5989bad4fe 100644 (file)
--- a/src/os2/joystick.cpp
+++ b/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

diff --git a/src/os2/pnghand.cpp b/src/os2/pnghand.cpp
index c5c3bad288bfc7a8b0a4a6d4629d47fa507467cc..2022d171f5baa1edf995c4ab32d1582ef6c46f09 100644 (file)
--- a/src/os2/pnghand.cpp
+++ b/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" {

diff --git a/src/os2/thread.cpp b/src/os2/thread.cpp
index a26fbf6e4ba7a6ce73b2b4ec06bb096a7739e837..79040df69e4c30117a05d7c3bc9f9152bb92777a 100644 (file)
--- a/src/os2/thread.cpp
+++ b/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
 // ----------------------------------------------------------------------------

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 6ae0e005b0e054b5852a6606edb728c9fc0924b2..54c26cbbeb940a2b78a62afb3e8a8c8bad951e3c 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 
 #include <sys/timeb.h>
-
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------

diff --git a/src/os2/utils.cpp b/src/os2/utils.cpp
index 9c2ea76d18b71d52fbdb716078e620581abb2034..7183147cf26526ec666de13d4828c2d499a645fd 100644 (file)
--- a/src/os2/utils.cpp
+++ b/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_HEIGHT, 1L, (PLONG)pHeight);
+    ::DevQueryCaps(hdcScreen, CAPS_WIDTH, 1L, &lWidth);
+    ::DevQueryCaps(hdcScreen, CAPS_HEIGHT, 1L, &lHeight);
     DevCloseDC(hdcScreen);
+    *pWidth = (int)lWidth;
+    *pHeight = (int)lHeight;
 }
 
 bool wxDirExists(

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index 88048a5d18896941a105924bb0a94b6e9e374a0d..19afebe4d93f2baed72b32d42f361bfe53562171 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/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>

diff --git a/src/os2/wave.cpp b/src/os2/wave.cpp
index bf21d3730360aa89627ca46513b03491b9ecd662..ed70fafdb8e016514c76ad3a5fa4373fb4b1b928 100644 (file)
--- a/src/os2/wave.cpp
+++ b/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