More doxygen topic overview cleanup.

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

diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp
index 1302755133c1505c417b90505f736e5246a83bde..6d310fc0bd2c24e7e553c3c67ec2f5ce05fb9bfc 100644 (file)
--- a/src/dfb/brush.cpp
+++ b/src/dfb/brush.cpp
@@ -26,7 +26,7 @@
 // wxBrush
 //-----------------------------------------------------------------------------
 
-class wxBrushRefData: public wxObjectRefData
+class wxBrushRefData : public wxGDIRefData
 {
 public:
     wxBrushRefData(const wxColour& clr = wxNullColour, int style = wxSOLID)
@@ -41,11 +41,13 @@ public:
         m_style = data.m_style;
     }
 
+    virtual bool IsOk() const { return m_colour.IsOk(); }
+
     void SetStyle(int style)
     {
-        if ( style != wxSOLID && style == wxTRANSPARENT )
+        if ( style != wxSOLID && style != wxTRANSPARENT )
         {
-            wxFAIL_MSG( _T("only wxSOLID and wxTRANSPARENT styles are supported") );
+            wxFAIL_MSG( wxT("only wxSOLID and wxTRANSPARENT styles are supported") );
             style = wxSOLID;
         }
 
@@ -69,7 +71,7 @@ wxBrush::wxBrush(const wxColour &colour, int style)
 
 wxBrush::wxBrush(const wxBitmap &stippleBitmap)
 {
-    wxFAIL_MSG( "brushes with stipple bitmaps not implemented" );
+    wxFAIL_MSG( wxT("brushes with stipple bitmaps not implemented") );
 
     m_refData = new wxBrushRefData(*wxBLACK);
 }
@@ -80,11 +82,6 @@ bool wxBrush::operator==(const wxBrush& brush) const
     return m_refData == brush.m_refData;
 }
 
-bool wxBrush::Ok() const
-{
-    return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
-}
-
 int wxBrush::GetStyle() const
 {
     if (m_refData == NULL)
@@ -109,7 +106,7 @@ wxColour& wxBrush::GetColour() const
 
 wxBitmap *wxBrush::GetStipple() const
 {
-    wxFAIL_MSG( "brushes with stipple bitmaps not implemented" );
+    wxFAIL_MSG( wxT("brushes with stipple bitmaps not implemented") );
     return &wxNullBitmap;
 }
 
@@ -133,15 +130,15 @@ void wxBrush::SetStyle(int style)
 
 void wxBrush::SetStipple(const wxBitmap& WXUNUSED(stipple))
 {
-    wxFAIL_MSG( "brushes with stipple bitmaps not implemented" );
+    wxFAIL_MSG( wxT("brushes with stipple bitmaps not implemented") );
 }
 
-wxObjectRefData *wxBrush::CreateRefData() const
+wxGDIRefData *wxBrush::CreateGDIRefData() const
 {
     return new wxBrushRefData;
 }
 
-wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
 {
     return new wxBrushRefData(*(wxBrushRefData *)data);
 }