Compilation fir for VC6 after r73124.

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

diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp
index b4e4d058c08a7739dd4b341d9d9abc0111370d50..636cad3bae64cda2fea50fc933318b9de08a9701 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;


@@ -85,20 +85,20 @@ wxBrush::wxBrush(const wxBitmap &stippleBitmap)
 
 bool wxBrush::operator==(const wxBrush& brush) const
 {
 
 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
 {
     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
 {
 
     return M_BRUSHDATA->m_style;
 }
 
 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;
 }