Warning fixes.

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

diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp
index e45a28f3b131888f7626941f14b4afb96344931b..8187fbf42c882f17c7c30e6c623e4a4fdd5ea7a0 100644 (file)
--- a/src/os2/brush.cpp
+++ b/src/os2/brush.cpp
@@ -19,6 +19,7 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/brush.h"
+#include "wx/log.h"
 #endif
 
 #include "wx/os2/private.h"
@@ -137,7 +138,7 @@ bool wxBrush::RealizeResource()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
-            wxLogError("Unable to set current color table to RGB mode. Error: %s\n", sError);
+            wxLogError("Unable to set current color table to RGB mode. Error: %s\n", sError.c_str());
             return FALSE;
         }
 
@@ -204,7 +205,7 @@ bool wxBrush::RealizeResource()
         if (M_BRUSHDATA->m_hBrush==NULL) wxError("Cannot create brush","Internal error") ;
 #endif
         M_BRUSHDATA->m_vBundle.lColor        = vPmColour;
-        M_BRUSHDATA->m_vBundle.lBackColor    = CLR_DEFAULT;
+        M_BRUSHDATA->m_vBundle.lBackColor    = RGB_WHITE;
         M_BRUSHDATA->m_vBundle.usMixMode     = FM_OVERPAINT;
         M_BRUSHDATA->m_vBundle.usBackMixMode = BM_OVERPAINT;
 
@@ -219,7 +220,7 @@ bool wxBrush::RealizeResource()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
-            wxLogError("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n", sError);
+            wxLogError("Can't set Gpi attributes for an AREABUNDLE. Error: %s\n", sError.c_str());
         }
         return bOk;
     }