Compile fix.

[wxWidgets.git] / include / wx / mac / carbon / private.h

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 75947c1baeac2bb3f5ddb4e41b9c6f318f373a78..5b0e068b39ddfa6c7f1490d2ffcefb8b94662645 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -169,7 +169,8 @@ class wxMacDrawingHelper
 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false );
     ~wxMacDrawingHelper();
 public:
     wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false );
     ~wxMacDrawingHelper();

-    bool Ok() { return m_ok; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() { return m_ok; }

     void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ); }
     void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ); }
     void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ); }
     void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ); }
     void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ); }
     void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ); }


@@ -486,7 +487,8 @@ public :
 
     virtual void Dispose();
 
 
     virtual void Dispose();
 

-    bool Ok() const { return GetControlRef() != NULL; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return GetControlRef() != NULL; }

 
     void SetReferenceInNativeControl();
     static wxMacControl* GetReferenceFromNativeControl(ControlRef control);
 
     void SetReferenceInNativeControl();
     static wxMacControl* GetReferenceFromNativeControl(ControlRef control);


@@ -1164,7 +1166,8 @@ public:
     virtual ~wxBitmapRefData();
 
     void Free();
     virtual ~wxBitmapRefData();
 
     void Free();

-    bool Ok() const { return m_ok; }
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const { return m_ok; }

     void SetOk( bool isOk) { m_ok = isOk; }
 
     void SetWidth( int width ) { m_width = width; }
     void SetOk( bool isOk) { m_ok = isOk; }
 
     void SetWidth( int width ) { m_width = width; }