Better temporary fix.

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

diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp
index 45fadb451a906fae24c5c4becc593c5edde13d9a..8e4682fff7330427599bf702508d542b9d9443c1 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,9 +83,6 @@ 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()


@@ -139,7 +124,7 @@ bool wxBrush::RealizeResource()
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
             wxLogError(_T("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str());
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
             wxLogError(_T("Unable to set current color table to RGB mode. Error: %s\n"), sError.c_str());

-            return FALSE;
+            return false;

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


@@ -212,8 +197,8 @@ bool wxBrush::RealizeResource()
         bOk = (bool)::GpiSetAttrs( M_BRUSHDATA->m_hBrush
                                   ,PRIM_AREA
                                   ,ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE |
         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
+                                  ,ABB_SET | ABB_SYMBOL | ABB_REF_POINT

                                   ,&M_BRUSHDATA->m_vBundle
                                  );
         if (!bOk)
                                   ,&M_BRUSHDATA->m_vBundle
                                  );
         if (!bOk)


@@ -224,7 +209,7 @@ bool wxBrush::RealizeResource()
         }
         return bOk;
     }
         }
         return bOk;
     }

-    return FALSE;
+    return false;

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


@@ -241,7 +226,7 @@ bool wxBrush::FreeResource( bool WXUNUSED(bForce) )
         M_BRUSHDATA->m_hBrush = 0;
         return true;
     }
         M_BRUSHDATA->m_hBrush = 0;
         return true;
     }

-    else return FALSE;
+    else return false;

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


@@ -266,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;