Fix recreating of wxBitmapComboBox using untyped client data.

[wxWidgets.git] / src / cocoa / brush.mm

diff --git a/src/cocoa/brush.mm b/src/cocoa/brush.mm
index b5934f26c4e33a645bdf2c36cefb0353e55783f6..b6eb6063b9eed7f712fafe7e3557cbc8da1cf3b7 100644 (file)
--- a/src/cocoa/brush.mm
+++ b/src/cocoa/brush.mm
@@ -4,9 +4,8 @@
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2003/07/03
 // Author:      David Elliott <dfe@cox.net>
 // Modified by:
 // Created:     2003/07/03

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -202,19 +201,19 @@ void wxBrush::SetStipple(const wxBitmap& stipple)
 
 wxColour wxBrush::GetColour() const
 {
 
 wxColour wxBrush::GetColour() const
 {

-    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid brush") );
+    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") );

     return M_BRUSHDATA->GetColour();
 }
 
 wxBrushStyle wxBrush::GetStyle() const
 {
     return M_BRUSHDATA->GetColour();
 }
 
 wxBrushStyle wxBrush::GetStyle() const
 {

-    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
+    wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );

     return M_BRUSHDATA->GetStyle();
 }
 
 wxBitmap *wxBrush::GetStipple() const
 {
     return M_BRUSHDATA->GetStyle();
 }
 
 wxBitmap *wxBrush::GetStipple() const
 {

-    wxCHECK_MSG( Ok(), 0, wxT("invalid brush") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid brush") );

     return M_BRUSHDATA->GetStipple();
 }
 
     return M_BRUSHDATA->GetStipple();
 }