Applied FreeBSD patch

[wxWidgets.git] / include / wx / motif / brush.h

diff --git a/include/wx/motif/brush.h b/include/wx/motif/brush.h
index 388604a61d7997afb55e3cc2fbec772309fc1b01..15488cba9bea692274a5119f24dda4596eb5ca38 100644 (file)
--- 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;
     int           m_style;
     wxBitmap      m_stipple ;
     wxColour      m_colour;

-
-/* TODO: implementation
-    WXHBRUSH      m_hBrush;
-*/

 };
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)
 };
 
 #define M_BRUSHDATA ((wxBrushRefData *)m_refData)


@@ -50,14 +46,11 @@ class WXDLLEXPORT wxBrush: public wxGDIObject
 public:
   wxBrush();
   wxBrush(const wxColour& col, int style);
 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); }
   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)  ;
   ~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)  ;
   virtual void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
   virtual void SetStyle(int style)  ;
   virtual void SetStipple(const wxBitmap& stipple)  ;


@@ -75,7 +68,7 @@ public:
 // Implementation
 
   // Useful helper: create the brush resource
 // Implementation
 
   // Useful helper: create the brush resource

-  void RealizeResource();
+  bool RealizeResource();

 
   // When setting properties, we must make sure we're not changing
   // another object
 
   // When setting properties, we must make sure we're not changing
   // another object