extracted OnSize() body in a new DoLayout() method so that it can be called from...

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

diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index 73efcf389a81dd81ba1081de26f2e8af89c5abae..d02dd2bdcfcd694567846b5c7805f9ea6dc4ddd1 100644 (file)
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -23,6 +23,7 @@
 #include "wx/string.h"
 #include "wx/log.h"
 #include "wx/window.h"
+#include "wx/app.h"
 
 #include "wx/os2/private.h"
 
@@ -69,7 +70,7 @@ static RECT        g_paintStruct;
 #ifdef __WXDEBUG__
     // a global variable which we check to verify that wxPaintDC are only
     // created in resopnse to WM_PAINT message - doing this from elsewhere is a
-    // common programming error among wxWindows programmers and might lead to
+    // common programming error among wxWidgets programmers and might lead to
     // very subtle and difficult to debug refresh/repaint bugs.
     int g_isPainting = 0;
 #endif // __WXDEBUG__
@@ -85,6 +86,8 @@ static RECT        g_paintStruct;
 wxWindowDC::wxWindowDC()
 {
     m_pCanvas = NULL;
+    m_PageSize.cx = m_PageSize.cy = 0;
+
 }
 
 wxWindowDC::wxWindowDC(
@@ -93,8 +96,12 @@ wxWindowDC::wxWindowDC(
 {
     ERRORID                         vError;
     wxString                        sError;
+    int                             nWidth, nHeight;
 
     m_pCanvas = pTheCanvas;
+    DoGetSize(&nWidth, &nHeight);
+    m_PageSize.cx = nWidth;
+    m_PageSize.cy = nHeight;
     m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas) );
 
     //
@@ -108,11 +115,17 @@ wxWindowDC::wxWindowDC(
                            ,&m_PageSize
                            ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                           );
+    if (!m_hPS)
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Unable to create presentation space. Error: %s\n", sError.c_str());
+    }
     ::GpiAssociate(m_hPS, NULLHANDLE);
     ::GpiAssociate(m_hPS, m_hDC);
 
     //
-    // Set the wxWindows color table
+    // Set the wxWidgets color table
     //
     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L
@@ -124,7 +137,7 @@ wxWindowDC::wxWindowDC(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
-        wxLogError("Unable to set current color table. Error: %s\n", sError);
+        wxLogError("Unable to set current color table. Error: %s\n", sError.c_str());
     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L
@@ -141,6 +154,7 @@ wxWindowDC::wxWindowDC(
 
 void wxWindowDC::InitDC()
 {
+
     //
     // The background mode is only used for text background and is set in
     // DrawText() to OPAQUE as required, otherwise always TRANSPARENT,
@@ -151,8 +165,38 @@ void wxWindowDC::InitDC()
     // Default bg colour is pne of the window
     //
     SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));
+
+    wxColour vColor( wxT("BLACK") );
+    m_pen.SetColour(vColor);
+
+    vColor.Set( wxT("WHITE") );
+    m_brush.SetColour(vColor);
+    InitializePalette();
+    wxFont*                         pFont = new wxFont( 12
+                                                       ,wxNORMAL
+                                                       ,wxNORMAL
+                                                       ,wxBOLD
+                                                      );
+    SetFont(*pFont);
+    delete pFont;
+    //
+    // OS/2 default vertical character allignment needs to match the other OS's
+    //
+    ::GpiSetTextAlignment((HPS)GetHPS(), TA_NORMAL_HORIZ, TA_BOTTOM);
+
 } // end of wxWindowDC::InitDC
 
+void wxWindowDC::DoGetSize(
+  int*                              pnWidth
+, int*                              pnHeight
+) const
+{
+    wxCHECK_RET( m_pCanvas, _T("wxWindowDC without a window?") );
+    m_pCanvas->GetSize( pnWidth
+                       ,pnHeight
+                      );
+} // end of wxWindowDC::DoGetSize
+
 // ----------------------------------------------------------------------------
 // wxClientDC
 // ----------------------------------------------------------------------------
@@ -182,7 +226,7 @@ wxClientDC::wxClientDC(
                           ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                          );
 
-    // Set the wxWindows color table
+    // Set the wxWidgets color table
     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L
                                   ,LCOLF_CONSECRGB
@@ -193,7 +237,7 @@ wxClientDC::wxClientDC(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
-        wxLogError("Unable to set current color table. Error: %s\n", sError);
+        wxLogError("Unable to set current color table. Error: %s\n", sError.c_str());
     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L
@@ -211,6 +255,40 @@ wxClientDC::wxClientDC(
     InitDC();
 } // end of wxClientDC::wxClientDC
 
+void wxClientDC::InitDC()
+{
+    wxWindowDC::InitDC();
+
+    // in wxUniv build we must manually do some DC adjustments usually
+    // performed by Windows for us
+#ifdef __WXUNIVERSAL__
+    wxPoint ptOrigin = m_pCanvas->GetClientAreaOrigin();
+    if ( ptOrigin.x || ptOrigin.y )
+    {
+        // no need to shift DC origin if shift is null
+        SetDeviceOrigin(ptOrigin.x, ptOrigin.y);
+    }
+
+    // clip the DC to avoid overwriting the non client area
+    SetClippingRegion(wxPoint(0, 0), m_pCanvas->GetClientSize());
+#endif // __WXUNIVERSAL__
+} // end of wxClientDC::InitDC
+
+wxClientDC::~wxClientDC()
+{
+} // end of wxClientDC::~wxClientDC
+
+void wxClientDC::DoGetSize(
+  int*                              pnWidth
+, int*                              pnHeight
+) const
+{
+    wxCHECK_RET( m_pCanvas, _T("wxWindowDC without a window?") );
+    m_pCanvas->GetClientSize( pnWidth
+                             ,pnHeight
+                            );
+} // end of wxClientDC::DoGetSize
+
 // ----------------------------------------------------------------------------
 // wxPaintDC
 // ----------------------------------------------------------------------------
@@ -253,12 +331,14 @@ wxPaintDC::wxPaintDC(
     {
         HPS                         hPS;
 
+        m_hDC = ::WinOpenWindowDC(GetWinHwnd(m_pCanvas));
         hPS = ::WinBeginPaint( GetWinHwnd(m_pCanvas)
                               ,NULLHANDLE
                               ,&g_paintStruct
                              );
         if(hPS)
         {
+            ::GpiAssociate(hPS, m_hDC);
             m_hOldPS = m_hPS;
             m_hPS = hPS;
             ::GpiCreateLogColorTable( m_hPS
@@ -283,7 +363,6 @@ wxPaintDC::wxPaintDC(
         }
 
         m_bIsPaintTime   = TRUE;
-        m_hDC = (WXHDC) -1; // to satisfy those anonizmous efforts
         ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this));
     }
     InitDC();
@@ -305,7 +384,7 @@ wxPaintDC::~wxPaintDC()
             ::WinEndPaint(m_hPS);
             m_hPS          = m_hOldPS;
             m_bIsPaintTime = FALSE;
-            ms_cache.Remove(nIndex);
+            ms_cache.RemoveAt(nIndex);
         }
         //else: cached DC entry is still in use