OSXTimer for all variants

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

diff --git a/src/osx/carbon/gauge.cpp b/src/osx/carbon/gauge.cpp
index b2f36abe9574f69147b0b54f7f9c048ade46d667..d0fcd5614215973f29d9d13df3cc2fe23609c997 100644 (file)
--- a/src/osx/carbon/gauge.cpp
+++ b/src/osx/carbon/gauge.cpp
@@ -17,7 +17,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 bool wxGauge::Create( wxWindow *parent,
     wxWindowID id,
@@ -60,7 +60,7 @@ void wxGauge::SetRange(int r)
     // we are going via the base class in case there is
     // some change behind the values by it
     wxGaugeBase::SetRange( r ) ;
-    if ( m_peer && m_peer->Ok() ){
+    if ( m_peer && m_peer->IsOk() ){
         // switch back to determinate mode if not there already
         if ( m_peer->GetData<Boolean>( kControlNoPart, kControlProgressBarIndeterminateTag ) != false )
         {
@@ -77,7 +77,7 @@ void wxGauge::SetValue(int pos)
     // some change behind the values by it
     wxGaugeBase::SetValue( pos ) ;
 
-    if ( m_peer && m_peer->Ok() )
+    if ( m_peer && m_peer->IsOk() )
     {
         // switch back to determinate mode if not there already
         if ( m_peer->GetData<Boolean>( kControlNoPart, kControlProgressBarIndeterminateTag ) != false )
@@ -110,7 +110,7 @@ int wxGauge::GetValue() const
 
 void wxGauge::Pulse()
 {
-    if ( m_peer && m_peer->Ok() )
+    if ( m_peer && m_peer->IsOk() )
     {
         if ( m_peer->GetData<Boolean>( kControlNoPart, kControlProgressBarIndeterminateTag ) != true )
         {