X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df91131cb0f90ee8bfb194926a13b1a108ca3c6e..ee5aa9d44fa75e88bce9981d7d02dea9f6d5f3c4:/src/os2/dcclient.cpp

diff --git a/src/os2/dcclient.cpp b/src/os2/dcclient.cpp
index 24de249cc2..b811e9a8df 100644
--- a/src/os2/dcclient.cpp
+++ b/src/os2/dcclient.cpp
@@ -24,12 +24,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/window.h"
 #endif
 
-#include "wx/log.h"
-#include "wx/window.h"
-#include "wx/app.h"
-
 #include "wx/os2/private.h"
 
 // ----------------------------------------------------------------------------
@@ -140,7 +139,7 @@ wxWindowDC::wxWindowDC(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
-        wxLogError(_T("Unable to set current color table. Error: %s\n"), sError.c_str());
+        wxLogError(_T("Unable to set current color table (3). Error: %s\n"), sError.c_str());
     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L
@@ -169,17 +168,10 @@ void wxWindowDC::InitDC()
     //
     SetBackground(wxBrush(m_pCanvas->GetBackgroundColour(), wxSOLID));
 
-    wxColour vColor( wxT("BLACK") );
-    m_pen.SetColour(vColor);
-
-    vColor.Set( wxT("WHITE") );
-    m_brush.SetColour(vColor);
+    m_pen.SetColour(*wxBLACK);
+    m_brush.SetColour(*wxWHITE);
     InitializePalette();
-    wxFont*                         pFont = new wxFont( 10
-                                                       ,wxMODERN
-                                                       ,wxNORMAL
-                                                       ,wxBOLD
-                                                      );
+    wxFont* pFont = new wxFont( 10, wxMODERN, wxNORMAL, wxBOLD );
     SetFont(*pFont);
     delete pFont;
     //
@@ -240,7 +232,7 @@ wxClientDC::wxClientDC(
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
-        wxLogError(_T("Unable to set current color table. Error: %s\n"), sError.c_str());
+        wxLogError(_T("Unable to set current color table (4). Error: %s\n"), sError.c_str());
     }
     ::GpiCreateLogColorTable( m_hPS
                              ,0L