gcc fixes

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

diff --git a/include/wx/mgl/brush.h b/include/wx/mgl/brush.h
index 8208130df51533a05ee07b9240ccf706e115c005..ec06a3821ea8850b72af616db9554f3bdffc8916 100644 (file)
--- a/include/wx/mgl/brush.h
+++ b/include/wx/mgl/brush.h
@@ -20,42 +20,48 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBrush;

 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxBrush: public wxBrushBase
+class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase

 {
 public:
     wxBrush() {}
 {
 public:
     wxBrush() {}

-    wxBrush(const wxColour &colour, int style = wxSOLID);
+    wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#endif

     wxBrush(const wxBitmap &stippleBitmap);
     wxBrush(const wxBitmap &stippleBitmap);

-    virtual ~wxBrush() {}
-    bool operator == (const wxBrush& brush) const;
-    bool operator != (const wxBrush& brush) const;
-    bool Ok() const;

 
 

-    virtual int GetStyle() const;
-    wxColour &GetColour() const;
+    bool operator==(const wxBrush& brush) const;
+    bool operator!=(const wxBrush& brush) const;
+
+    wxBrushStyle GetStyle() const;
+    wxColour GetColour() const;

     wxBitmap *GetStipple() const;
 
     void SetColour(const wxColour& col);
     void SetColour(unsigned char r, unsigned char g, unsigned char b);
     wxBitmap *GetStipple() const;
 
     void SetColour(const wxColour& col);
     void SetColour(unsigned char r, unsigned char g, unsigned char b);

-    void SetStyle(int style);
+    void SetStyle(wxBrushStyle style);

     void SetStipple(const wxBitmap& stipple);
 
     void SetStipple(const wxBitmap& stipple);
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( void SetStyle(int style) )
+        { SetStyle((wxBrushStyle)style); }
+#endif
+

     // implementation:
 
     void* GetMaskPattern() const;
     void* GetPixPattern() const;
 
 protected:
     // implementation:
 
     void* GetMaskPattern() const;
     void* GetPixPattern() const;
 
 protected:

-    // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxBrush)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBrush)