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 2719da49547689670ab479024cb5eb07e7c824b1..a80c01b7aa8c9aaf98efa10be6d3ffbabed4a897 100644 (file)
--- a/src/palmos/brush.cpp
+++ b/src/palmos/brush.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/brush.cpp
 // Purpose:     wxBrush
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,10 +13,6 @@
 // declarations
 // ============================================================================
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "brush.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -33,6 +29,7 @@
     #include "wx/utils.h"
     #include "wx/app.h"
     #include "wx/brush.h"
+    #include "wx/colour.h"
 #endif // WX_PRECOMP
 
 // ----------------------------------------------------------------------------
@@ -53,7 +50,7 @@ wxBrush::wxBrush()
 {
 }
 
-wxBrush::wxBrush(const wxColour& col, int style)
+wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)
 {
 }
 
@@ -69,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;
+    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;
 }
@@ -98,7 +90,7 @@ wxColour wxBrush::GetColour() const
     return wxNullColour;
 }
 
-int wxBrush::GetStyle() const
+wxBrushStyle wxBrush::GetStyle() const
 {
     return -1;
 }
@@ -117,20 +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))
 {
 }
-
-