don't wake up on Windows messages when waiting for thread termination in a console...

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

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index bfdb10ce833beaa5c7657ee5693f274fd9492fe9..1332c9d2fbb91bbd0cbfa09e4ff64cd6b2b80edc 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -1,46 +1,38 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/os2/dcmemory.cpp

 // Purpose:     wxMemoryDC class
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxMemoryDC class
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/dcmemory.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 
 #endif
 
 #include "wx/os2/private.h"
 

-#include "wx/dcmemory.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 

-wxMemoryDC::wxMemoryDC(void)
-{
-    CreateCompatible(NULL);
-    Init();
-} // end of wxMemoryDC::wxMemoryDC
-

 wxMemoryDC::wxMemoryDC(
   wxDC*                             pOldDC
 )
 {
 wxMemoryDC::wxMemoryDC(
   wxDC*                             pOldDC
 )
 {

-    pOldDC->BeginDrawing();

     CreateCompatible(pOldDC);
     CreateCompatible(pOldDC);

-    pOldDC->EndDrawing();

     Init();
 } // end of wxMemoryDC::wxMemoryDC
 
     Init();
 } // end of wxMemoryDC::wxMemoryDC
 


@@ -58,14 +50,12 @@ void wxMemoryDC::Init()
     memset(&m_vRclPaint, 0, sizeof(m_vRclPaint));
 } // end of wxMemoryDC::Init
 
     memset(&m_vRclPaint, 0, sizeof(m_vRclPaint));
 } // end of wxMemoryDC::Init
 

-bool wxMemoryDC::CreateCompatible(
-  wxDC*                             pDC
-)
+bool wxMemoryDC::CreateCompatible( wxDC* WXUNUSED(pDC) )

 {
 {

-    HDC                             hDC;
-    HPS                             hPS;
-    DEVOPENSTRUC                    vDOP = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
-    SIZEL                           vSize = {0, 0};
+    HDC           hDC;
+    HPS           hPS;
+    DEVOPENSTRUC  vDOP = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
+    SIZEL         vSize = {0, 0};

 
     //
     // Create a memory device context
 
     //
     // Create a memory device context


@@ -78,8 +68,8 @@ bool wxMemoryDC::CreateCompatible(
         {
             m_hPS = hPS;
             m_hDC = hDC;
         {
             m_hPS = hPS;
             m_hDC = hDC;

-            m_ok = TRUE;
-            m_bOwnsDC = TRUE;
+            m_ok = true;
+            m_bOwnsDC = true;

             //
             // Set the wxWidgets color table
             //
             //
             // Set the wxWidgets color table
             //


@@ -102,27 +92,27 @@ bool wxMemoryDC::CreateCompatible(
         {
             m_hPS = NULLHANDLE;
             m_hDC = NULLHANDLE;
         {
             m_hPS = NULLHANDLE;
             m_hDC = NULLHANDLE;

-            m_ok  = FALSE;
-            m_bOwnsDC = FALSE;
+            m_ok  = false;
+            m_bOwnsDC = false;

         }
     }
     else
     {
         m_hPS = NULLHANDLE;
         m_hDC = NULLHANDLE;
         }
     }
     else
     {
         m_hPS = NULLHANDLE;
         m_hDC = NULLHANDLE;

-        m_ok  = FALSE;
-        m_bOwnsDC = FALSE;
+        m_ok  = false;
+        m_bOwnsDC = false;

     }
 
     //
     // As we created the DC, we must delete it in the dtor
     //
     }
 
     //
     // As we created the DC, we must delete it in the dtor
     //

-    m_bOwnsDC = TRUE;
+    m_bOwnsDC = true;

     m_ok = m_hDC != 0;
     return m_ok;
 } // end of wxMemoryDC::CreateCompatible
 
     m_ok = m_hDC != 0;
     return m_ok;
 } // end of wxMemoryDC::CreateCompatible
 

-void wxMemoryDC::SelectObject(
+void wxMemoryDC::DoSelect(

   const wxBitmap&                   rBitmap
 )
 {
   const wxBitmap&                   rBitmap
 )
 {


@@ -169,6 +159,7 @@ void wxMemoryDC::SelectObject(
                    );
         m_vSelectedBitmap.SetSelectedInto(NULL);
     }
                    );
         m_vSelectedBitmap.SetSelectedInto(NULL);
     }

+

     m_vSelectedBitmap = rBitmap;
 
 
     m_vSelectedBitmap = rBitmap;
 
 


@@ -202,4 +193,3 @@ void wxMemoryDC::DoGetSize(
     *pWidth = m_vSelectedBitmap.GetWidth();
     *pHeight = m_vSelectedBitmap.GetHeight();
 } // end of wxMemoryDC::DoGetSize
     *pWidth = m_vSelectedBitmap.GetWidth();
     *pHeight = m_vSelectedBitmap.GetHeight();
 } // end of wxMemoryDC::DoGetSize

-