cocoa specific implementations

[wxWidgets.git] / src / osx / carbon / button.cpp

diff --git a/src/osx/carbon/button.cpp b/src/osx/carbon/button.cpp
index 87fa56c82bc0f5bc6f86603b175f066e94fac100..9974fc5aa41081fc591ad13c6c9e5a22564b98f0 100644 (file)
--- a/src/osx/carbon/button.cpp
+++ b/src/osx/carbon/button.cpp
@@ -21,7 +21,7 @@
 
 #include "wx/stockitem.h"
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 
@@ -92,7 +92,7 @@ bool wxButton::Create(wxWindow *parent,
     }
 
     verify_noerr( err );
-    wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ;
+    wxASSERT_MSG( m_peer != NULL && m_peer->IsOk() , wxT("No valid Mac control") ) ;
 
     MacPostControlCreate( pos, size );
 
@@ -154,7 +154,7 @@ wxSize wxButton::DoGetBestSize() const
 
         wxCFStringRef str( m_label,  GetFont().GetEncoding() );
 
-#if wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_ATSU_TEXT
         SInt16 baseline;
         if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
         {
@@ -236,7 +236,7 @@ bool wxDisclosureTriangle::Create(wxWindow *parent, wxWindowID id, const wxStrin
             m_peer->GetControlRefAddr() );
            
     verify_noerr( err );
-    wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid Mac control") ) ;
+    wxASSERT_MSG( m_peer != NULL && m_peer->IsOk() , wxT("No valid Mac control") ) ;
 
     MacPostControlCreate( pos, size );
     // passing the text in the param doesn't seem to work, so lets do if again