X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad6bd8701eda692b5fcf6f833e041c38756c608a..cc5de8fe047e00cf3fbaa16b3a02a9aac7caf16e:/src/os2/dcmemory.cpp

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index 5e2ed33694..770e42bce4 100644
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.cpp
+// Name:        src/os2/dcmemory.cpp
 // Purpose:     wxMemoryDC class
 // Author:      David Webster
 // Modified by:
@@ -12,35 +12,36 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/dcmemory.h"
+
 #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"
 
-#include "wx/dcmemory.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
 {
     CreateCompatible(NULL);
     Init();
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 } // end of wxMemoryDC::wxMemoryDC
 
 wxMemoryDC::wxMemoryDC(
   wxDC*                             pOldDC
 )
 {
-    pOldDC->BeginDrawing();
     CreateCompatible(pOldDC);
-    pOldDC->EndDrawing();
     Init();
 } // end of wxMemoryDC::wxMemoryDC
 
@@ -58,14 +59,12 @@ void 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
@@ -78,10 +77,10 @@ bool wxMemoryDC::CreateCompatible(
         {
             m_hPS = hPS;
             m_hDC = hDC;
-            m_ok = TRUE;
-            m_bOwnsDC = TRUE;
+            m_ok = true;
+            m_bOwnsDC = true;
             //
-            // Set the wxWindows color table
+            // Set the wxWidgets color table
             //
             ::GpiCreateLogColorTable( m_hPS
                                      ,0L
@@ -102,22 +101,22 @@ bool wxMemoryDC::CreateCompatible(
         {
             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;
-        m_ok  = FALSE;
-        m_bOwnsDC = FALSE;
+        m_ok  = false;
+        m_bOwnsDC = false;
     }
 
     //
     // 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
@@ -153,9 +152,10 @@ void wxMemoryDC::SelectObject(
         //
         // Bmps drawn to are upside down, so flip it before committing
         //
-        POINTL                      vPoint[4] = { 0, m_vSelectedBitmap.GetHeight(),
-                                                  m_vSelectedBitmap.GetWidth(), 0,
-                                                  0, 0, m_vSelectedBitmap.GetWidth(), m_vSelectedBitmap.GetHeight()
+        POINTL                      vPoint[4] = { {0, m_vSelectedBitmap.GetHeight()}
+                                                 ,{m_vSelectedBitmap.GetWidth(), 0}
+                                                 ,{0, 0}
+                                                 ,{m_vSelectedBitmap.GetWidth(), m_vSelectedBitmap.GetHeight()}
                                                 };
 
 
@@ -201,4 +201,3 @@ void wxMemoryDC::DoGetSize(
     *pWidth = m_vSelectedBitmap.GetWidth();
     *pHeight = m_vSelectedBitmap.GetHeight();
 } // end of wxMemoryDC::DoGetSize
-