The alignment controls are now left-aligned if the floating controls are not shown.

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

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index 1332c9d2fbb91bbd0cbfa09e4ff64cd6b2b80edc..9950c287b6198821ac83f6f462af9b2249fd44bb 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/src/os2/dcmemory.cpp
@@ -4,7 +4,6 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,6 +12,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"
+#include "wx/os2/dcmemory.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -22,21 +22,37 @@
 
 #include "wx/os2/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPMDCImpl)
 
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 
-wxMemoryDC::wxMemoryDC(
-  wxDC*                             pOldDC
-)
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
+        : wxPMDCImpl( owner )
+{
+    CreateCompatible(NULL);
+    Init();
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap )
+        : wxPMDCImpl( owner )
 {
+    CreateCompatible(NULL);
+    Init();
+    DoSelect(bitmap);
+}
+
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *pOldDC)
+        : wxPMDCImpl( owner )
+{
+    wxCHECK_RET( pOldDC, wxT("NULL dc in wxMemoryDC ctor") );
+
     CreateCompatible(pOldDC);
     Init();
 } // end of wxMemoryDC::wxMemoryDC
 
-void wxMemoryDC::Init()
+void wxMemoryDCImpl::Init()
 {
     if (m_ok)
     {
@@ -50,7 +66,7 @@ void wxMemoryDC::Init()
     memset(&m_vRclPaint, 0, sizeof(m_vRclPaint));
 } // end of wxMemoryDC::Init
 
-bool wxMemoryDC::CreateCompatible( wxDC* WXUNUSED(pDC) )
+bool wxMemoryDCImpl::CreateCompatible( wxDC* WXUNUSED(pDC) )
 {
     HDC           hDC;
     HPS           hPS;
@@ -112,7 +128,7 @@ bool wxMemoryDC::CreateCompatible( wxDC* WXUNUSED(pDC) )
     return m_ok;
 } // end of wxMemoryDC::CreateCompatible
 
-void wxMemoryDC::DoSelect(
+void wxMemoryDCImpl::DoSelect(
   const wxBitmap&                   rBitmap
 )
 {
@@ -122,7 +138,7 @@ void wxMemoryDC::DoSelect(
     if (m_hOldBitmap)
     {
         ::GpiSetBitmap(m_hPS, NULLHANDLE);
-        if (m_vSelectedBitmap.Ok())
+        if (m_vSelectedBitmap.IsOk())
         {
             m_vSelectedBitmap.SetSelectedInto(NULL);
             m_vSelectedBitmap = wxNullBitmap;
@@ -133,7 +149,7 @@ void wxMemoryDC::DoSelect(
     // Check for whether the bitmap is already selected into a device context
     //
     wxCHECK_RET( !rBitmap.GetSelectedInto() ||
-                 (rBitmap.GetSelectedInto() == this),
+                 (rBitmap.GetSelectedInto() == GetOwner()),
                  wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
 
     WXHBITMAP                       hBmp = rBitmap.GetHBITMAP();
@@ -169,7 +185,7 @@ void wxMemoryDC::DoSelect(
         m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, NULLHANDLE);
         return;
     }
-    m_vSelectedBitmap.SetSelectedInto(this);
+    m_vSelectedBitmap.SetSelectedInto(GetOwner());
     m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, (HBITMAP)hBmp);
 
     if (m_hOldBitmap == HBM_ERROR)
@@ -179,12 +195,12 @@ void wxMemoryDC::DoSelect(
     }
 } // end of wxMemoryDC::SelectObject
 
-void wxMemoryDC::DoGetSize(
+void wxMemoryDCImpl::DoGetSize(
   int*                              pWidth
 , int*                              pHeight
 ) const
 {
-    if (!m_vSelectedBitmap.Ok())
+    if (!m_vSelectedBitmap.IsOk())
     {
         *pWidth  = 0;
         *pHeight = 0;