wxControl::SetLabel no longer strips out codes so do it here

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

diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp
index e45a28f3b131888f7626941f14b4afb96344931b..defdde27979e3ac4c02aabbb631e288981c89142 100644 (file)
--- a/src/os2/brush.cpp
+++ b/src/os2/brush.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        brush.cpp
+// Name:        src/os2/brush.cpp

 // Purpose:     wxBrush
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxBrush
 // Author:      David Webster
 // Modified by:


@@ -14,11 +14,11 @@
 
 #ifndef WX_PRECOMP
 #include <stdio.h>
 
 #ifndef WX_PRECOMP
 #include <stdio.h>

-#include "wx/setup.h"

 #include "wx/list.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/brush.h"
 #include "wx/list.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/brush.h"

+#include "wx/log.h"

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


@@ -101,9 +101,9 @@ wxBrush::wxBrush(
 
 bool wxBrush::RealizeResource()
 {
 
 bool wxBrush::RealizeResource()
 {

-    BOOL                            bOk;
-    ERRORID                         vError;
-    wxString                        sError;
+    bool     bOk;
+    ERRORID  vError;
+    wxString sError;

 
     if (M_BRUSHDATA && M_BRUSHDATA->m_hBrush == 0L)
     {
 
     if (M_BRUSHDATA && M_BRUSHDATA->m_hBrush == 0L)
     {


@@ -137,13 +137,13 @@ bool wxBrush::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);
-            return FALSE;
+            wxLogError(_T("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str());
+            return false;

         }
 
         if (M_BRUSHDATA->m_nStyle==wxTRANSPARENT)
         {
         }
 
         if (M_BRUSHDATA->m_nStyle==wxTRANSPARENT)
         {

-            return TRUE;
+            return true;

         }
         COLORREF                    vPmColour = 0L;
 
         }
         COLORREF                    vPmColour = 0L;
 


@@ -204,26 +204,26 @@ bool wxBrush::RealizeResource()
         if (M_BRUSHDATA->m_hBrush==NULL) wxError("Cannot create brush","Internal error") ;
 #endif
         M_BRUSHDATA->m_vBundle.lColor        = vPmColour;
         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;
 
         M_BRUSHDATA->m_vBundle.usMixMode     = FM_OVERPAINT;
         M_BRUSHDATA->m_vBundle.usBackMixMode = BM_OVERPAINT;
 

-        bOk = ::GpiSetAttrs( M_BRUSHDATA->m_hBrush
-                            ,PRIM_AREA
-                            ,ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE |
-                             ABB_SET | ABB_SYMBOL
-                            ,ABB_REF_POINT
-                            ,&M_BRUSHDATA->m_vBundle
-                           );
+        bOk = (bool)::GpiSetAttrs( M_BRUSHDATA->m_hBrush
+                                  ,PRIM_AREA
+                                  ,ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE |
+                                   ABB_SET | ABB_SYMBOL
+                                  ,ABB_REF_POINT
+                                  ,&M_BRUSHDATA->m_vBundle
+                                 );

         if (!bOk)
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         if (!bOk)
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

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

         }
         return bOk;
     }
         }
         return bOk;
     }

-    return FALSE;
+    return false;

 } // end of wxBrush::RealizeResource
 
 WXHANDLE wxBrush::GetResourceHandle()
 } // end of wxBrush::RealizeResource
 
 WXHANDLE wxBrush::GetResourceHandle()


@@ -233,16 +233,14 @@ WXHANDLE wxBrush::GetResourceHandle()
     return (WXHANDLE)M_BRUSHDATA->m_hBrush;
 } // end of wxBrush::GetResourceHandle
 
     return (WXHANDLE)M_BRUSHDATA->m_hBrush;
 } // end of wxBrush::GetResourceHandle
 

-bool wxBrush::FreeResource(
-  bool                              WXUNUSED(bForce)
-)
+bool wxBrush::FreeResource( bool WXUNUSED(bForce) )

 {
     if (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush != 0))
     {
         M_BRUSHDATA->m_hBrush = 0;
 {
     if (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush != 0))
     {
         M_BRUSHDATA->m_hBrush = 0;

-        return TRUE;
+        return true;

     }
     }

-    else return FALSE;
+    else return false;

 } // end of wxBrush::FreeResource
 
 bool wxBrush::IsFree() const
 } // end of wxBrush::FreeResource
 
 bool wxBrush::IsFree() const


@@ -267,32 +265,21 @@ void wxBrush::Unshare()
     }
 } // end of wxBrush::Unshare
 
     }
 } // end of wxBrush::Unshare
 

-void wxBrush::SetColour(
-  const wxColour&                   rColour
-)
+void wxBrush::SetColour( const wxColour& rColour )

 {
     Unshare();
     M_BRUSHDATA->m_vColour = rColour;
     RealizeResource();
 }
 
 {
     Unshare();
     M_BRUSHDATA->m_vColour = rColour;
     RealizeResource();
 }
 

-void wxBrush::SetColour(
-  unsigned char                     cRed
-, unsigned char                     cGreen
-, unsigned char                     cBlue
-)
+void wxBrush::SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBlue)

 {
     Unshare();
 {
     Unshare();

-    M_BRUSHDATA->m_vColour.Set( cRed
-                               ,cGreen
-                               ,cBlue
-                              );
+    M_BRUSHDATA->m_vColour.Set( cRed, cGreen, cBlue );

     RealizeResource();
 } // end of wxBrush::SetColour
 
     RealizeResource();
 } // end of wxBrush::SetColour
 

-void wxBrush::SetStyle(
-  int                               nStyle
-)
+void wxBrush::SetStyle(int nStyle)

 {
     Unshare();
     M_BRUSHDATA->m_nStyle = nStyle;
 {
     Unshare();
     M_BRUSHDATA->m_nStyle = nStyle;


@@ -318,4 +305,3 @@ void wxBrush::SetPS(
     M_BRUSHDATA->m_hBrush = hPS;
     RealizeResource();
 } // end of WxWinGdi_CPen::SetPS
     M_BRUSHDATA->m_hBrush = hPS;
     RealizeResource();
 } // end of WxWinGdi_CPen::SetPS

-