blind fix for GCC compilation when #pragmas are honored

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

diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index b8d62a043b90a2280122cde492fccd47603c7e9f..d02dd2bdcfcd694567846b5c7805f9ea6dc4ddd1 100644 (file)
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -70,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
 #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__
     // very subtle and difficult to debug refresh/repaint bugs.
     int g_isPainting = 0;
 #endif // __WXDEBUG__


@@ -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,11 +115,17 @@ 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("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);
 
     //

-    // Set the wxWindows color table
+    // Set the wxWidgets color table

     //
     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L
     //
     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L


@@ -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);
+        wxLogError("Unable to set current color table. Error: %s\n", sError.c_str());

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


@@ -142,12 +154,7 @@ wxWindowDC::wxWindowDC(
 
 void wxWindowDC::InitDC()
 {
 
 void wxWindowDC::InitDC()
 {

-    wxColour                        vColor;

 
 

-    vColor.InitFromName("BLACK");
-    m_pen.SetColour(vColor);
-    vColor.Set("WHITE");
-    m_brush.SetColour(vColor);

     //
     // The background mode is only used for text background and is set in
     // DrawText() to OPAQUE as required, otherwise always TRANSPARENT,
     //
     // The background mode is only used for text background and is set in
     // DrawText() to OPAQUE as required, otherwise always TRANSPARENT,


@@ -158,6 +165,25 @@ void wxWindowDC::InitDC()
     // Default bg colour is pne of the window
     //
     SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));
     // 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(
 } // end of wxWindowDC::InitDC
 
 void wxWindowDC::DoGetSize(


@@ -200,7 +226,7 @@ wxClientDC::wxClientDC(
                           ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                          );
 
                           ,PU_PELS | GPIF_LONG | GPIA_ASSOC
                          );
 

-    // Set the wxWindows color table
+    // Set the wxWidgets color table

     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L
                                   ,LCOLF_CONSECRGB
     if (!::GpiCreateLogColorTable( m_hPS
                                   ,0L
                                   ,LCOLF_CONSECRGB


@@ -211,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);
+        wxLogError("Unable to set current color table. Error: %s\n", sError.c_str());

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


@@ -305,12 +331,14 @@ wxPaintDC::wxPaintDC(
     {
         HPS                         hPS;
 
     {
         HPS                         hPS;
 

+        m_hDC = ::WinOpenWindowDC(GetWinHwnd(m_pCanvas));

         hPS = ::WinBeginPaint( GetWinHwnd(m_pCanvas)
                               ,NULLHANDLE
                               ,&g_paintStruct
                              );
         if(hPS)
         {
         hPS = ::WinBeginPaint( GetWinHwnd(m_pCanvas)
                               ,NULLHANDLE
                               ,&g_paintStruct
                              );
         if(hPS)
         {

+            ::GpiAssociate(hPS, m_hDC);

             m_hOldPS = m_hPS;
             m_hPS = hPS;
             ::GpiCreateLogColorTable( m_hPS
             m_hOldPS = m_hPS;
             m_hPS = hPS;
             ::GpiCreateLogColorTable( m_hPS


@@ -335,7 +363,6 @@ wxPaintDC::wxPaintDC(
         }
 
         m_bIsPaintTime   = TRUE;
         }
 
         m_bIsPaintTime   = TRUE;

-        m_hDC = (WXHDC) -1; // to satisfy those anonizmous efforts

         ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this));
     }
     InitDC();
         ms_cache.Add(new wxPaintDCInfo(m_pCanvas, this));
     }
     InitDC();