Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp
index efbd60cbbce83df5b8736db6243f21b6f7891872..620a04aed90c6267e312bb1de945ae4b117f5f13 100644 (file)
--- a/src/dfb/brush.cpp
+++ b/src/dfb/brush.cpp
@@ -48,7 +48,7 @@ public:
         if ( style != wxSOLID && style != wxTRANSPARENT )
         {
             wxFAIL_MSG( wxT("only wxSOLID and wxTRANSPARENT styles are supported") );
         if ( style != wxSOLID && style != wxTRANSPARENT )
         {
             wxFAIL_MSG( wxT("only wxSOLID and wxTRANSPARENT styles are supported") );

-            style = wxSOLID;
+            style = wxBRUSHSTYLE_SOLID;

         }
 
         m_style = style;
         }
 
         m_style = style;


@@ -91,14 +91,14 @@ bool wxBrush::operator==(const wxBrush& brush) const
 
 wxBrushStyle wxBrush::GetStyle() const
 {
 
 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;
 }
 
 
     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;
 }
 
     return M_BRUSHDATA->m_colour;
 }