Make sure that WXMAKINGDLL_XRC is defined correctly for monolithic DLL builds

[wxWidgets.git] / src / os2 / utilsgui.cpp

diff --git a/src/os2/utilsgui.cpp b/src/os2/utilsgui.cpp
index 52701bb3c6d2d0a237d387cb4ddc5cd95eba3f11..fd710bbc2020136929e43efe0bef30c712d87459 100644 (file)
--- a/src/os2/utilsgui.cpp
+++ b/src/os2/utilsgui.cpp
@@ -57,8 +57,6 @@ public:
     }
 };
 
     }
 };
 

-static wxTimer*                     wxTheSleepTimer = NULL;
-

 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 #if wxUSE_RESOURCES
 bool wxWriteResource(
 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 #if wxUSE_RESOURCES
 bool wxWriteResource(


@@ -335,7 +333,6 @@ bool wxCheckForInterrupt(
         QMSG                        vMsg;
         HAB                         hab = 0;
         HWND                        hwndFilter = NULLHANDLE;
         QMSG                        vMsg;
         HAB                         hab = 0;
         HWND                        hwndFilter = NULLHANDLE;

-        HWND                        hwndWin= (HWND) pWnd->GetHWND();

 
         while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE))
         {
 
         while(::WinPeekMsg(hab, &vMsg, hwndFilter, 0, 0, PM_REMOVE))
         {


@@ -473,6 +470,16 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
     wxDisplaySize(width, height);
 }
 
     wxDisplaySize(width, height);
 }
 

+void wxGUIAppTraits::InitializeGui(unsigned long &ulHab)
+{
+    ulHab = ::WinInitialize(0);
+}
+
+void wxGUIAppTraits::TerminateGui(unsigned long ulHab)
+{
+    ::WinTerminate(ulHab);
+}
+

 wxToolkitInfo & wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo           vInfo;
 wxToolkitInfo & wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo           vInfo;