Compile fix for VC++ 5 and 6.

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

diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp
index fb9a09ae3158eb05b22c09241cc1998d9f057a06..1c9f7c84d551606694d78a241035c0321dee4c65 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:


@@ -13,13 +13,12 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.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/log.h"
+    #include <stdio.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"


@@ -35,9 +34,7 @@ wxBrushRefData::wxBrushRefData()
     memset(&m_vBundle, '\0', sizeof(AREABUNDLE));
 } // end of wxBrushRefData::wxBrushRefData
 
     memset(&m_vBundle, '\0', sizeof(AREABUNDLE));
 } // end of wxBrushRefData::wxBrushRefData
 

-wxBrushRefData::wxBrushRefData(
-  const wxBrushRefData&             rData
-)
+wxBrushRefData::wxBrushRefData(const wxBrushRefData& rData)

 {
     m_nStyle   = rData.m_nStyle;
     m_vStipple = rData.m_vStipple;
 {
     m_nStyle   = rData.m_nStyle;
     m_vStipple = rData.m_vStipple;


@@ -55,14 +52,10 @@ wxBrushRefData::~wxBrushRefData()
 //
 wxBrush::wxBrush()
 {
 //
 wxBrush::wxBrush()
 {

-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 } // end of wxBrush::wxBrush
 
 wxBrush::~wxBrush()
 {
 } // end of wxBrush::wxBrush
 
 wxBrush::~wxBrush()
 {

-    if ( wxTheBrushList )
-        wxTheBrushList->RemoveBrush(this);

 } // end of wxBrush::~wxBrush
 
 wxBrush::wxBrush(
 } // end of wxBrush::~wxBrush
 
 wxBrush::wxBrush(


@@ -78,14 +71,9 @@ wxBrush::wxBrush(
     memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
 
     RealizeResource();
     memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
 
     RealizeResource();

-
-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 } // end of wxBrush::wxBrush
 
 } // end of wxBrush::wxBrush
 

-wxBrush::wxBrush(
-  const wxBitmap&                   rStipple
-)
+wxBrush::wxBrush(const wxBitmap& rStipple)

 {
     m_refData = new wxBrushRefData;
 
 {
     m_refData = new wxBrushRefData;
 


@@ -95,16 +83,13 @@ wxBrush::wxBrush(
     memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
 
     RealizeResource();
     memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
 
     RealizeResource();

-
-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);

 } // end of wxBrush::wxBrush
 
 bool wxBrush::RealizeResource()
 {
 } // end of wxBrush::wxBrush
 
 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)
     {


@@ -138,13 +123,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;
 


@@ -209,41 +194,39 @@ bool wxBrush::RealizeResource()
         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
+                                  ,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
 
 } // end of wxBrush::RealizeResource
 

-WXHANDLE wxBrush::GetResourceHandle()
+WXHANDLE wxBrush::GetResourceHandle() const

 {
     if (!M_BRUSHDATA)
         return 0;
     return (WXHANDLE)M_BRUSHDATA->m_hBrush;
 } // end of wxBrush::GetResourceHandle
 
 {
     if (!M_BRUSHDATA)
         return 0;
     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


@@ -268,32 +251,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;


@@ -319,4 +291,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

-