X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b3c861501a451503b31c075ccb59d16b0ae01e99..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/dfb/brush.cpp

diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp
index da4a6935d9..93209e3362 100644
--- a/src/dfb/brush.cpp
+++ b/src/dfb/brush.cpp
@@ -43,9 +43,9 @@ public:
 
     void SetStyle(int style)
     {
-        if ( m_style != wxSOLID && m_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 +69,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,7 +80,7 @@ bool wxBrush::operator==(const wxBrush& brush) const
     return m_refData == brush.m_refData;
 }
 
-bool wxBrush::Ok() const
+bool wxBrush::IsOk() const
 {
     return ((m_refData) && M_BRUSHDATA->m_colour.Ok());
 }
@@ -109,7 +109,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,7 +133,7 @@ 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