X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac3688c0d8a39d200f0556ad4b401d89b45ff04a..bfdaa9173ed5b20dd5a9cd83241ce44fc0eff960:/src/dfb/brush.cpp

diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp
index efbd60cbbc..c4935f602e 100644
--- a/src/dfb/brush.cpp
+++ b/src/dfb/brush.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxBrush class implementation
 // Author:      Vaclav Slavik
 // Created:     2006-08-04
-// RCS-ID:      $Id$
 // Copyright:   (c) 2006 REA Elektronik GmbH
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -48,7 +47,7 @@ public:
         if ( style != wxSOLID && style != wxTRANSPARENT )
         {
             wxFAIL_MSG( wxT("only wxSOLID and wxTRANSPARENT styles are supported") );
-            style = wxSOLID;
+            style = wxBRUSHSTYLE_SOLID;
         }
 
         m_style = style;
@@ -85,20 +84,20 @@ wxBrush::wxBrush(const wxBitmap &stippleBitmap)
 
 bool wxBrush::operator==(const wxBrush& brush) const
 {
-#warning "this is incorrect (MGL too)"
+#warning "this is incorrect"
     return m_refData == brush.m_refData;
 }
 
 wxBrushStyle wxBrush::GetStyle() const
 {
-    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, _T("invalid brush") );
+    wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
 
     return M_BRUSHDATA->m_style;
 }
 
-wxColour& wxBrush::GetColour() const
+wxColour wxBrush::GetColour() const
 {
-    wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
+    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") );
 
     return M_BRUSHDATA->m_colour;
 }