Try to better revert to the original string value in wxBitmapComboBox::RecreateControl()

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

diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp
index 6da22a5cbea168832e49880fe04a23f794327d00..c5f951fff7df1ab33ff2c5876092f17806e48039 100644 (file)
--- a/src/os2/brush.cpp
+++ b/src/os2/brush.cpp
@@ -1,47 +1,88 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxBrush
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxBrush
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #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"
 

-#include "assert.h"
+class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
+{
+    friend class WXDLLIMPEXP_FWD_CORE wxBrush;
+public:
+    wxBrushRefData(const wxColour& colour = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
+    wxBrushRefData(const wxBitmap& stipple);
+    wxBrushRefData(const wxBrushRefData& rData);
+    virtual ~wxBrushRefData();
+
+    bool operator == (const wxBrushRefData& data) const
+    {
+        return (m_nStyle == data.m_nStyle &&
+                m_vStipple.IsSameAs(data.m_vStipple) &&
+                m_vColour == data.m_vColour);
+    }
+
+protected:
+    wxBrushStyle m_nStyle;
+    wxBitmap     m_vStipple;
+    wxColour     m_vColour;
+    WXHBRUSH     m_hBrush; // in OS/2 GPI this will be the PS the pen is associated with
+    AREABUNDLE   m_vBundle;
+};
+
+#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
+
+// ============================================================================
+// wxBrushRefData implementation
+// ============================================================================

 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 

-wxBrushRefData::wxBrushRefData()
+// ----------------------------------------------------------------------------
+// wxBrushRefData ctors/dtor
+// ----------------------------------------------------------------------------
+
+wxBrushRefData::wxBrushRefData(const wxColour& colour, wxBrushStyle style)
+              : m_vColour(colour)

 {
 {

-    m_nStyle = wxSOLID;
+    m_nStyle = style;

     m_hBrush = 0;
     memset(&m_vBundle, '\0', sizeof(AREABUNDLE));
 } // end of wxBrushRefData::wxBrushRefData
 
     m_hBrush = 0;
     memset(&m_vBundle, '\0', sizeof(AREABUNDLE));
 } // end of wxBrushRefData::wxBrushRefData
 

-wxBrushRefData::wxBrushRefData(
-  const wxBrushRefData&             rData
-)
+wxBrushRefData::wxBrushRefData(const wxBitmap& stipple)
+{
+    m_vStipple = stipple;
+    m_nStyle = stipple.GetMask() ? wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE
+                                 : wxBRUSHSTYLE_STIPPLE;
+
+    m_hBrush = NULL;
+    memset(&m_vBundle, '\0', sizeof(AREABUNDLE));
+}
+
+wxBrushRefData::wxBrushRefData(const wxBrushRefData& rData)
+              : wxGDIRefData(),
+                m_vStipple(rData.m_vStipple),
+                m_vColour(rData.m_vColour)

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

-    m_vStipple = rData.m_vStipple;
-    m_vColour  = rData.m_vColour;

     m_hBrush   = 0;
     memcpy(&m_vBundle, &rData.m_vBundle, sizeof(AREABUNDLE));
 } // end of wxBrushRefData::wxBrushRefData
     m_hBrush   = 0;
     memcpy(&m_vBundle, &rData.m_vBundle, sizeof(AREABUNDLE));
 } // end of wxBrushRefData::wxBrushRefData


@@ -50,61 +91,53 @@ wxBrushRefData::~wxBrushRefData()
 {
 } // end of wxBrushRefData::~wxBrushRefData
 
 {
 } // end of wxBrushRefData::~wxBrushRefData
 

-//
-// Brushes
-//
+// ============================================================================
+// wxBrush implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxBrush ctors/dtor
+// ----------------------------------------------------------------------------
+

 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(
   const wxColour&                   rColour
 } // end of wxBrush::~wxBrush
 
 wxBrush::wxBrush(
   const wxColour&                   rColour

-, int                               nStyle
+, wxBrushStyle                      nStyle

 )
 {
 )
 {

-    m_refData = new wxBrushRefData;
-
-    M_BRUSHDATA->m_vColour = rColour;
-    M_BRUSHDATA->m_nStyle  = nStyle;
-    M_BRUSHDATA->m_hBrush  = 0;
-    memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
+    m_refData = new wxBrushRefData(rColour, nStyle);

 
     RealizeResource();
 
     RealizeResource();

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

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

-wxBrush::wxBrush(
-  const wxBitmap&                   rStipple
-)
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)

 {
 {

-    m_refData = new wxBrushRefData;
-
-    M_BRUSHDATA->m_nStyle   = wxSTIPPLE;
-    M_BRUSHDATA->m_vStipple = rStipple;
-    M_BRUSHDATA->m_hBrush  = 0;
-    memset(&M_BRUSHDATA->m_vBundle, '\0', sizeof(AREABUNDLE));
+    m_refData = new wxBrushRefData(col, (wxBrushStyle)style);

 
     RealizeResource();
 
     RealizeResource();

+}
+#endif

 
 

-    if ( wxTheBrushList )
-        wxTheBrushList->AddBrush(this);
+wxBrush::wxBrush(const wxBitmap& rStipple)
+{
+    m_refData = new wxBrushRefData(rStipple);
+
+    RealizeResource();

 } // 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 +171,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.c_str());
-            return FALSE;
+            wxLogError(wxT("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 +242,71 @@ 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.c_str());
+            wxLogError(wxT("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()
+// ----------------------------------------------------------------------------
+// wxBrush accessors
+// ----------------------------------------------------------------------------
+
+wxColour wxBrush::GetColour() const
+{
+    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") );
+
+    return M_BRUSHDATA->m_vColour;
+}
+
+wxBrushStyle wxBrush::GetStyle() const

 {
 {

-    if (!M_BRUSHDATA)
-        return 0;
+    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
+
+    return M_BRUSHDATA->m_nStyle;
+}
+
+wxBitmap *wxBrush::GetStipple() const
+{
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid brush") );
+
+    return &(M_BRUSHDATA->m_vStipple);
+}
+
+int wxBrush::GetPS() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid brush") );
+
+    return M_BRUSHDATA->m_hBrush;
+}
+
+WXHANDLE wxBrush::GetResourceHandle() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid brush") );
+

     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


@@ -251,51 +314,27 @@ bool wxBrush::IsFree() const
   return (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0));
 } // end of wxBrush::IsFree
 
   return (M_BRUSHDATA && (M_BRUSHDATA->m_hBrush == 0));
 } // end of wxBrush::IsFree
 

-void wxBrush::Unshare()
-{
-    //
-    // Don't change shared data
-    //
-    if (!m_refData)
-    {
-        m_refData = new wxBrushRefData();
-    }
-    else
-    {
-        wxBrushRefData* ref = new wxBrushRefData(*(wxBrushRefData*)m_refData);
-        UnRef();
-        m_refData = ref;
-    }
-} // end of wxBrush::Unshare
+// ----------------------------------------------------------------------------
+// wxBrush setters
+// ----------------------------------------------------------------------------

 
 

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

 {
 {

-    Unshare();
+    AllocExclusive();

     M_BRUSHDATA->m_vColour = rColour;
     RealizeResource();
 }
 
     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();
-    M_BRUSHDATA->m_vColour.Set( cRed
-                               ,cGreen
-                               ,cBlue
-                              );
+    AllocExclusive();
+    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(wxBrushStyle nStyle)

 {
 {

-    Unshare();
+    AllocExclusive();

     M_BRUSHDATA->m_nStyle = nStyle;
     RealizeResource();
 } // end of wxBrush::SetStyle
     M_BRUSHDATA->m_nStyle = nStyle;
     RealizeResource();
 } // end of wxBrush::SetStyle


@@ -304,7 +343,7 @@ void wxBrush::SetStipple(
   const wxBitmap&                   rStipple
 )
 {
   const wxBitmap&                   rStipple
 )
 {

-    Unshare();
+    AllocExclusive();

     M_BRUSHDATA->m_vStipple = rStipple;
     RealizeResource();
 } // end of wxBrush::SetStipple
     M_BRUSHDATA->m_vStipple = rStipple;
     RealizeResource();
 } // end of wxBrush::SetStipple


@@ -313,10 +352,34 @@ void wxBrush::SetPS(
   HPS                               hPS
 )
 {
   HPS                               hPS
 )
 {

-    Unshare();
+    AllocExclusive();

     if (M_BRUSHDATA->m_hBrush)
         ::GpiDestroyPS(M_BRUSHDATA->m_hBrush);
     M_BRUSHDATA->m_hBrush = hPS;
     RealizeResource();
 } // end of WxWinGdi_CPen::SetPS
 
     if (M_BRUSHDATA->m_hBrush)
         ::GpiDestroyPS(M_BRUSHDATA->m_hBrush);
     M_BRUSHDATA->m_hBrush = hPS;
     RealizeResource();
 } // end of WxWinGdi_CPen::SetPS
 

+// ----------------------------------------------------------------------------
+// wxBrush house keeping stuff
+// ----------------------------------------------------------------------------
+
+bool wxBrush::operator == (
+    const wxBrush& brush
+) const
+{
+    if (m_refData == brush.m_refData) return true;
+
+    if (!m_refData || !brush.m_refData) return false;
+
+    return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
+} // end of wxBrush::operator ==
+
+wxGDIRefData *wxBrush::CreateGDIRefData() const
+{
+    return new wxBrushRefData;
+}
+
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
+{
+    return new wxBrushRefData(*(const wxBrushRefData *)data);
+}