Added wx/listbase.h with wxListCtrl types, so we can

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

diff --git a/include/wx/motif/brush.h b/include/wx/motif/brush.h
index 388604a61d7997afb55e3cc2fbec772309fc1b01..513d7fc9c3b198446f7437ebaf8e6369a6201f92 100644 (file)
--- a/include/wx/motif/brush.h
+++ b/include/wx/motif/brush.h
@@ -29,15 +29,11 @@ public:
     wxBrushRefData();
     wxBrushRefData(const wxBrushRefData& data);
     ~wxBrushRefData();
     wxBrushRefData();
     wxBrushRefData(const wxBrushRefData& data);
     ~wxBrushRefData();

-
+    

 protected:
     int           m_style;
     wxBitmap      m_stipple ;
     wxColour      m_colour;
 protected:
     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)


@@ -45,42 +41,39 @@ protected:
 // Brush
 class WXDLLEXPORT wxBrush: public wxGDIObject
 {
 // Brush
 class WXDLLEXPORT wxBrush: public wxGDIObject
 {

-  DECLARE_DYNAMIC_CLASS(wxBrush)
-
+    DECLARE_DYNAMIC_CLASS(wxBrush)
+        

 public:
 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 wxColour& GetColour() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); };
-  inline int GetStyle() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); };
-  inline wxBitmap *GetStipple() const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); };
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
-
-// Implementation
-
-  // Useful helper: create the brush resource
-  void RealizeResource();
-
-  // When setting properties, we must make sure we're not changing
-  // another object
-  void Unshare();
+    wxBrush();
+    wxBrush(const wxColour& col, int style);
+    wxBrush(const wxBitmap& stipple);
+    inline wxBrush(const wxBrush& brush) { Ref(brush); }
+    ~wxBrush();
+    
+    virtual void SetColour(const wxColour& 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) 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); };
+    inline wxBitmap *GetStipple() const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); };
+    
+    virtual bool Ok() const { return (m_refData != NULL) ; }
+    
+    // Implementation
+    
+    // Useful helper: create the brush resource
+    bool RealizeResource();
+    
+    // When setting properties, we must make sure we're not changing
+    // another object
+    void Unshare();

 };
 
 #endif
 };
 
 #endif

-    // _WX_BRUSH_H_
+// _WX_BRUSH_H_