Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / palmos / brush.cpp

diff --git a/src/palmos/brush.cpp b/src/palmos/brush.cpp
index a87d4b1f6d5b095f70fd56fa8c141a6730a6c2cf..a80c01b7aa8c9aaf98efa10be6d3ffbabed4a897 100644 (file)
--- a/src/palmos/brush.cpp
+++ b/src/palmos/brush.cpp
@@ -29,6 +29,7 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/brush.h"
+    #include "wx/colour.h"
 #endif // WX_PRECOMP
 
 // ----------------------------------------------------------------------------
@@ -49,7 +50,7 @@ wxBrush::wxBrush()
 {
 }
 
-wxBrush::wxBrush(const wxColour& col, int style)
+wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)
 {
 }
 
@@ -65,22 +66,17 @@ wxBrush::~wxBrush()
 // wxBrush house keeping stuff
 // ----------------------------------------------------------------------------
 
-wxBrush& wxBrush::operator=(const wxBrush& brush)
-{
-    return *this;
-}
-
 bool wxBrush::operator==(const wxBrush& brush) const
 {
     return false;
 }
 
-wxObjectRefData *wxBrush::CreateRefData() const
+wxGDIRefData *wxBrush::CreateGDIRefData() const
 {
     return NULL;
 }
 
-wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
 {
     return NULL;
 }
@@ -94,7 +90,7 @@ wxColour wxBrush::GetColour() const
     return wxNullColour;
 }
 
-int wxBrush::GetStyle() const
+wxBrushStyle wxBrush::GetStyle() const
 {
     return -1;
 }
@@ -113,18 +109,18 @@ WXHANDLE wxBrush::GetResourceHandle() const
 // wxBrush setters
 // ----------------------------------------------------------------------------
 
-void wxBrush::SetColour(const wxColour& col)
+void wxBrush::SetColour(const wxColour& WXUNUSED(col))
 {
 }
 
-void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
+void wxBrush::SetColour(unsigned char WXUNUSED(r), unsigned char WXUNUSED(g), unsigned char WXUNUSED(b))
 {
 }
 
-void wxBrush::SetStyle(int style)
+void wxBrush::SetStyle(wxBrushStyle WXUNUSED(style))
 {
 }
 
-void wxBrush::SetStipple(const wxBitmap& stipple)
+void wxBrush::SetStipple(const wxBitmap& WXUNUSED(stipple))
 {
 }