Changed wxHTML default font size for printing to be 12pt regardless

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

diff --git a/include/wx/palmos/brush.h b/include/wx/palmos/brush.h
index 6d45ab02989ff78cfa4fb19d828b60c80a05f1fd..ba55d5bad7de96364a0e4235c890c3636adc8cba 100644 (file)
--- a/include/wx/palmos/brush.h
+++ b/include/wx/palmos/brush.h
@@ -22,39 +22,38 @@ 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& col, int style = wxSOLID);
+    wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
+#endif

     wxBrush(const wxBitmap& stipple);
     virtual ~wxBrush();
 
     virtual void SetColour(const wxColour& col);
     virtual void SetColour(unsigned char r, unsigned char g, unsigned char b);
     wxBrush(const wxBitmap& stipple);
     virtual ~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 SetStyle(wxBrushStyle style);

     virtual void SetStipple(const wxBitmap& stipple);
 
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;
     virtual void SetStipple(const wxBitmap& stipple);
 
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;

-    virtual int GetStyle() const;
+    wxBrushStyle GetStyle() const;

     wxBitmap *GetStipple() const;
 
     wxBitmap *GetStipple() const;
 

-    bool Ok() const { return IsOk(); }
-    bool IsOk() const { return m_refData != NULL; }
-

     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;
 
 protected:
     // return the HBRUSH for this brush
     virtual WXHANDLE GetResourceHandle() const;
 
 protected:

-    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)
 };
 

-#endif
-    // _WX_BRUSH_H_
+#endif // _WX_BRUSH_H_