move wxWindowGTK::DoPopupMenu back to window.cpp

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

diff --git a/include/wx/palmos/brush.h b/include/wx/palmos/brush.h
index 37b4f2388f5c08f624e4ee4940997e816c87ef6d..2c354a56bb0b00771a6d7a832531193d17492d67 100644 (file)
--- a/include/wx/palmos/brush.h
+++ b/include/wx/palmos/brush.h
@@ -16,7 +16,7 @@
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 
 #include "wx/gdiobj.h"
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxBrush;

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


@@ -26,36 +26,31 @@ class WXDLLEXPORT wxBrush : public wxBrushBase
 {
 public:
     wxBrush();
 {
 public:
     wxBrush();

-    wxBrush(const wxColour& col, int style = wxSOLID);
+    wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);

     wxBrush(const wxBitmap& stipple);
     wxBrush(const wxBitmap& stipple);

-    wxBrush(const wxBrush& brush) { Ref(brush); }

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

-    wxBrush& operator=(const wxBrush& brush);

     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
     wxColour GetColour() const;

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

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

-    bool Ok() 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_