1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

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

diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index 7e2c5d5a5591f7cb4553655e72179f70c36b42f5..b533fdc19aa83e8b91927fcf2d39e22d9d4a6beb 100644 (file)
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -86,6 +86,8 @@ static RECT        g_paintStruct;
 wxWindowDC::wxWindowDC()
 {
     m_pCanvas = NULL;
 wxWindowDC::wxWindowDC()
 {
     m_pCanvas = NULL;

+    m_PageSize.cx = m_PageSize.cy = 0;
+

 }
 
 wxWindowDC::wxWindowDC(
 }
 
 wxWindowDC::wxWindowDC(


@@ -94,8 +96,12 @@ wxWindowDC::wxWindowDC(
 {
     ERRORID                         vError;
     wxString                        sError;
 {
     ERRORID                         vError;
     wxString                        sError;

+    int                             nWidth, nHeight;

 
     m_pCanvas = pTheCanvas;
 
     m_pCanvas = pTheCanvas;

+    DoGetSize(&nWidth, &nHeight);
+    m_PageSize.cx = nWidth;
+    m_PageSize.cy = nHeight;

     m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas) );
 
     //
     m_hDC = (WXHDC) ::WinOpenWindowDC(GetWinHwnd(pTheCanvas) );
 
     //


@@ -109,6 +115,12 @@ wxWindowDC::wxWindowDC(
                            ,&m_PageSize
                            ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                           );
                            ,&m_PageSize
                            ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                           );

+    if (!m_hPS)
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError(_T("Unable to create presentation space. Error: %s\n"), sError.c_str());
+    }

     ::GpiAssociate(m_hPS, NULLHANDLE);
     ::GpiAssociate(m_hPS, m_hDC);
 
     ::GpiAssociate(m_hPS, NULLHANDLE);
     ::GpiAssociate(m_hPS, m_hDC);
 


@@ -125,7 +137,7 @@ wxWindowDC::wxWindowDC(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError("Unable to set current color table. Error: %s\n", sError.c_str());
+        wxLogError(_T("Unable to set current color table. Error: %s\n"), sError.c_str());

     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L
     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L


@@ -168,7 +180,7 @@ void wxWindowDC::InitDC()
     SetFont(*pFont);
     delete pFont;
     //
     SetFont(*pFont);
     delete pFont;
     //

-    // OS/2 default vertical character allignment needs to match the other OS's
+    // OS/2 default vertical character alignment needs to match the other OS's

     //
     ::GpiSetTextAlignment((HPS)GetHPS(), TA_NORMAL_HORIZ, TA_BOTTOM);
 
     //
     ::GpiSetTextAlignment((HPS)GetHPS(), TA_NORMAL_HORIZ, TA_BOTTOM);
 


@@ -225,7 +237,7 @@ wxClientDC::wxClientDC(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);

-        wxLogError("Unable to set current color table. Error: %s\n", sError.c_str());
+        wxLogError(_T("Unable to set current color table. Error: %s\n"), sError.c_str());

     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L
     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L