fixing #9910

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

diff --git a/src/osx/carbon/frame.cpp b/src/osx/carbon/frame.cpp
index d17d5d8147f1c04a58c77ed732dee84fe8e52291..515da910a278e93ea953d9863e65647dc7138b17 100644 (file)
--- a/src/osx/carbon/frame.cpp
+++ b/src/osx/carbon/frame.cpp
@@ -24,7 +24,7 @@
     #include "wx/menuitem.h"
 #endif // WX_PRECOMP
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)
@@ -86,7 +86,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
         }
         else
         {
-#if !wxMAC_USE_NATIVE_TOOLBAR
+#if !wxOSX_USE_NATIVE_TOOLBAR
             pt.y += h;
 #endif
         }
@@ -225,7 +225,7 @@ void wxFrame::DetachMenuBar()
 
 void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 {
-    wxFrame* tlf = wxDynamicCast( wxFindWinFromMacWindow( FrontNonFloatingWindow() ) , wxFrame );
+    wxFrame* tlf = wxDynamicCast( wxNonOwnedWindow::GetFromWXWindow( (WXWindow) FrontNonFloatingWindow() ) , wxFrame );
     bool makeCurrent = false;
 
     // if this is already the current menubar or we are the frontmost window
@@ -268,7 +268,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
         }
         else
         {
-#if !wxMAC_USE_NATIVE_TOOLBAR
+#if !wxOSX_USE_NATIVE_TOOLBAR
             if ( y )
                 *y -= h;
 #endif
@@ -318,14 +318,14 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
     if ( m_frameToolBar == toolbar )
         return ;
 
-#if wxMAC_USE_NATIVE_TOOLBAR
+#if wxOSX_USE_NATIVE_TOOLBAR
     if ( m_frameToolBar )
         m_frameToolBar->MacInstallNativeToolbar( false ) ;
 #endif
 
     m_frameToolBar = toolbar ;
 
-#if wxMAC_USE_NATIVE_TOOLBAR
+#if wxOSX_USE_NATIVE_TOOLBAR
     if ( toolbar )
         toolbar->MacInstallNativeToolbar( true ) ;
 #endif
@@ -380,7 +380,7 @@ void wxFrame::PositionToolBar()
         }
         else
         {
-#if !wxMAC_USE_NATIVE_TOOLBAR
+#if !wxOSX_USE_NATIVE_TOOLBAR
             // Use the 'real' position
             GetToolBar()->SetSize(tx , ty , cw , th, wxSIZE_NO_ADJUSTMENTS );
 #endif