(blind) fix for gcc 3.4 warning for an always true comparison in an assert

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

diff --git a/src/os2/pen.cpp b/src/os2/pen.cpp
index b26c80e4aba225fc1483efad7c1ed4b8a6eeb953..77badbd512ec44d2e4de8745851c962ac470fb95 100644 (file)
--- a/src/os2/pen.cpp
+++ b/src/os2/pen.cpp
@@ -19,6 +19,7 @@
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/pen.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/pen.h"

+#include "wx/log.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"


@@ -108,6 +109,10 @@ wxPen::wxPen(
         wxThePenList->AddPen(this);
 } // end of wxPen::wxPen
 
         wxThePenList->AddPen(this);
 } // end of wxPen::wxPen
 

+int wx2os2PenStyle(
+  int                               nWxStyle
+);
+

 bool wxPen::RealizeResource()
 {
     BOOL                            bOk;
 bool wxPen::RealizeResource()
 {
     BOOL                            bOk;


@@ -146,7 +151,7 @@ bool wxPen::RealizeResource()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             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;
         }
         if (M_PENDATA->m_nStyle == wxTRANSPARENT)
             return FALSE;
         }
         if (M_PENDATA->m_nStyle == wxTRANSPARENT)


@@ -210,7 +215,7 @@ bool wxPen::RealizeResource()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

-            wxLogError("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n", sError);
+            wxLogError("Can't set Gpi attributes for a LINEBUNDLE. Error: %s\n", sError.c_str());

             return FALSE;
         }
 
             return FALSE;
         }
 


@@ -295,7 +300,7 @@ bool wxPen::RealizeResource()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             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;
     }
         }
         return bOk;
     }