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 b42e3844419cdd6a00ec961bbd76c973ff1e0048..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
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99

-// RCS-ID:      $Id$

 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,6 +12,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"
 #include "wx/wxprec.h"
 
 #include "wx/dcmemory.h"

+#include "wx/os2/dcmemory.h"

 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"


@@ -22,27 +22,37 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxPMDCImpl)

 
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 

-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner )
+        : wxPMDCImpl( owner )

 {
     CreateCompatible(NULL);
     Init();
 {
     CreateCompatible(NULL);
     Init();

-} // end of wxMemoryDC::wxMemoryDC
+}

 
 

-wxMemoryDC::wxMemoryDC(
-  wxDC*                             pOldDC
-)
+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
 
     CreateCompatible(pOldDC);
     Init();
 } // end of wxMemoryDC::wxMemoryDC
 

-void wxMemoryDC::Init()
+void wxMemoryDCImpl::Init()

 {
     if (m_ok)
     {
 {
     if (m_ok)
     {


@@ -56,7 +66,7 @@ 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* WXUNUSED(pDC) )
+bool wxMemoryDCImpl::CreateCompatible( wxDC* WXUNUSED(pDC) )

 {
     HDC           hDC;
     HPS           hPS;
 {
     HDC           hDC;
     HPS           hPS;


@@ -118,7 +128,7 @@ bool wxMemoryDC::CreateCompatible( wxDC* WXUNUSED(pDC) )
     return m_ok;
 } // end of wxMemoryDC::CreateCompatible
 
     return m_ok;
 } // end of wxMemoryDC::CreateCompatible
 

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

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


@@ -128,7 +138,7 @@ void wxMemoryDC::SelectObject(
     if (m_hOldBitmap)
     {
         ::GpiSetBitmap(m_hPS, NULLHANDLE);
     if (m_hOldBitmap)
     {
         ::GpiSetBitmap(m_hPS, NULLHANDLE);

-        if (m_vSelectedBitmap.Ok())
+        if (m_vSelectedBitmap.IsOk())

         {
             m_vSelectedBitmap.SetSelectedInto(NULL);
             m_vSelectedBitmap = wxNullBitmap;
         {
             m_vSelectedBitmap.SetSelectedInto(NULL);
             m_vSelectedBitmap = wxNullBitmap;


@@ -139,7 +149,7 @@ void wxMemoryDC::SelectObject(
     // Check for whether the bitmap is already selected into a device context
     //
     wxCHECK_RET( !rBitmap.GetSelectedInto() ||
     // 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();
                  wxT("Bitmap is selected in another wxMemoryDC, delete the first wxMemoryDC or use SelectObject(NULL)") );
 
     WXHBITMAP                       hBmp = rBitmap.GetHBITMAP();


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

+

     m_vSelectedBitmap = rBitmap;
 
 
     m_vSelectedBitmap = rBitmap;
 
 


@@ -174,7 +185,7 @@ void wxMemoryDC::SelectObject(
         m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, NULLHANDLE);
         return;
     }
         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)
     m_hOldBitmap = (WXHBITMAP)::GpiSetBitmap(m_hPS, (HBITMAP)hBmp);
 
     if (m_hOldBitmap == HBM_ERROR)


@@ -184,12 +195,12 @@ void wxMemoryDC::SelectObject(
     }
 } // end of wxMemoryDC::SelectObject
 
     }
 } // end of wxMemoryDC::SelectObject
 

-void wxMemoryDC::DoGetSize(
+void wxMemoryDCImpl::DoGetSize(

   int*                              pWidth
 , int*                              pHeight
 ) const
 {
   int*                              pWidth
 , int*                              pHeight
 ) const
 {

-    if (!m_vSelectedBitmap.Ok())
+    if (!m_vSelectedBitmap.IsOk())

     {
         *pWidth  = 0;
         *pHeight = 0;
     {
         *pWidth  = 0;
         *pHeight = 0;