X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b6dbb09746f8f5ee0549a2ff39ae0ac4c725898..244d3b67caf13566cdcef6cccdd85163845c893e:/include/wx/motif/brush.h

diff --git a/include/wx/motif/brush.h b/include/wx/motif/brush.h
index 388604a61d..03c23ce98a 100644
--- a/include/wx/motif/brush.h
+++ b/include/wx/motif/brush.h
@@ -34,10 +34,6 @@ protected:
     int           m_style;
     wxBitmap      m_stipple ;
     wxColour      m_colour;
-
-/* TODO: implementation
-    WXHBRUSH      m_hBrush;
-*/
 };
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
@@ -50,21 +46,18 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 public:
   wxBrush();
   wxBrush(const wxColour& col, int style);
-  wxBrush(const wxString& col, int style);
   wxBrush(const wxBitmap& stipple);
   inline wxBrush(const wxBrush& brush) { Ref(brush); }
-  inline wxBrush(const wxBrush* brush) { if (brush) Ref(*brush); }
   ~wxBrush();
 
   virtual void SetColour(const wxColour& col)  ;
-  virtual void SetColour(const wxString& col)  ;
   virtual void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
   virtual void SetStyle(int style)  ;
   virtual void SetStipple(const wxBitmap& stipple)  ;
 
   inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; }
-  inline bool operator == (const wxBrush& brush) { return m_refData == brush.m_refData; }
-  inline bool operator != (const wxBrush& brush) { return m_refData != brush.m_refData; }
+  inline bool operator == (const wxBrush& brush) const { return m_refData == brush.m_refData; }
+  inline bool operator != (const wxBrush& brush) const { return m_refData != brush.m_refData; }
 
   inline wxColour& GetColour() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); };
   inline int GetStyle() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); };
@@ -75,7 +68,7 @@ public:
 // Implementation
 
   // Useful helper: create the brush resource
-  void RealizeResource();
+  bool RealizeResource();
 
   // When setting properties, we must make sure we're not changing
   // another object