fixing file paths after renaming

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/carbon/aboutdlg.cpp

@@ -27,7 +27,7 @@
 #include "wx/aboutdlg.h"
 #include "wx/generic/aboutdlgg.h"
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 // helper class for HIAboutBox options
 class AboutBoxOptions : public wxCFRef<CFMutableDictionaryRef>

src/osx/carbon/app.cpp

@@ -45,7 +45,7 @@
 
 // mac
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 #ifdef __DARWIN__
 #  include <CoreServices/CoreServices.h>

src/osx/carbon/bitmap.cpp

@@ -28,7 +28,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 #ifndef __WXOSX_IPHONE__
 #include <QuickTime/QuickTime.h>
 #endif

src/osx/carbon/bmpbuttn.cpp

@@ -22,7 +22,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 //---------------------------------------------------------------------------
 // Helper functions

src/osx/carbon/brush.cpp

@@ -17,7 +17,7 @@
     #include "wx/utils.h"
 #endif
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 

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)
 

src/osx/carbon/cfsocket.cpp

@@ -34,7 +34,7 @@
 #include "wx/apptrait.h"
 
 #include "wx/sckaddr.h"
-#include "wx/mac/carbon/private.h"
+#include "wx/osx/carbon/private.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>

src/osx/carbon/checkbox.cpp

@@ -14,7 +14,7 @@
 #if wxUSE_CHECKBOX
 
 #include "wx/checkbox.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)

src/osx/carbon/checklst.cpp

@@ -22,7 +22,7 @@
     #include "wx/arrstr.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
 

src/osx/carbon/choice.cpp

@@ -20,7 +20,7 @@
     #include "wx/dcclient.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 extern MenuHandle NewUniqueMenu() ;
 

src/osx/carbon/clipbrd.cpp

@@ -27,7 +27,7 @@
 
 #include "wx/metafile.h"
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 #define wxUSE_DATAOBJ 1
 

src/osx/carbon/colordlg.cpp

@@ -12,7 +12,7 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/mac/colordlg.h"
+#include "wx/osx/colordlg.h"
 #include "wx/fontdlg.h"
 
 
@@ -20,7 +20,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 /*
  * wxColourDialog

src/osx/carbon/colordlgosx.mm

@@ -20,7 +20,7 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/mac/colordlg.h"
+#include "wx/osx/colordlg.h"
 #include "wx/fontdlg.h"
 
 // ============================================================================

src/osx/carbon/colour.cpp

@@ -17,7 +17,7 @@
     #include "wx/gdicmn.h"
 #endif
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 

src/osx/carbon/combobox.cpp

@@ -23,7 +23,7 @@
     #include "wx/textctrl.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 

src/osx/carbon/combobxc.cpp

@@ -18,7 +18,7 @@
     #include "wx/menu.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 #if TARGET_API_MAC_OSX
 #ifndef __HIVIEW__
     #include <HIToolbox/HIView.h>

src/osx/carbon/control.cpp

@@ -31,8 +31,8 @@
 #include "wx/tabctrl.h"
 #include "wx/spinbutt.h"
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 

src/osx/carbon/cursor.cpp

@@ -21,7 +21,7 @@
 
 #include "wx/xpmdecod.h"
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject)

src/osx/carbon/databrow.cpp

@@ -23,9 +23,9 @@
 #endif
 
 #include "wx/dataview.h"
-#include "wx/mac/carbon/databrow.h"
+#include "wx/osx/carbon/databrow.h"
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 #include <limits>
 

src/osx/carbon/dataobj.cpp

@@ -27,7 +27,7 @@
 #include "wx/metafile.h"
 #include "wx/tokenzr.h"
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 #ifdef __DARWIN__
     #include <QuickTime/QuickTime.h>

src/osx/carbon/dataview.cpp

@@ -18,7 +18,7 @@
 
 #include <limits>
 
-#include "wx/mac/carbon/databrow.h"
+#include "wx/osx/carbon/databrow.h"
 
 #ifndef WX_PRECOMP
     #include "wx/timer.h"

src/osx/carbon/dcclient.cpp

@@ -25,7 +25,7 @@
 
 #include "wx/graphics.h"
 #include "wx/rawbmp.h"
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 //-----------------------------------------------------------------------------
 // wxWindowDCImpl

src/osx/carbon/dcmemory.cpp

@@ -13,9 +13,9 @@
 
 #include "wx/dcmemory.h"
 #include "wx/graphics.h"
-#include "wx/mac/dcmemory.h"
+#include "wx/osx/dcmemory.h"
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 //-----------------------------------------------------------------------------
 // wxMemoryDCImpl

src/osx/carbon/dcprint.cpp

@@ -25,9 +25,9 @@
     #include "wx/math.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
-#include "wx/mac/private/print.h"
+#include "wx/osx/private/print.h"
-#include "wx/mac/carbon/dcprint.h"
+#include "wx/osx/carbon/dcprint.h"
 #include "wx/graphics.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxGCDCImpl)

src/osx/carbon/dcscreen.cpp

@@ -12,9 +12,9 @@
 #include "wx/wxprec.h"
 
 #include "wx/dcscreen.h"
-#include "wx/mac/carbon/dcscreen.h"
+#include "wx/osx/carbon/dcscreen.h"
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 #include "wx/graphics.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl)

src/osx/carbon/dialog.cpp

@@ -20,7 +20,7 @@
     #include "wx/settings.h"
 #endif // WX_PRECOMP
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 
 // Lists to keep track of windows, so we can disable/enable them

src/osx/carbon/dirdlg.cpp

@@ -23,7 +23,7 @@
 
 #include "wx/filename.h"
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 #ifdef __DARWIN__
     #include <Carbon/Carbon.h>

src/osx/carbon/dirmac.cpp

@@ -33,7 +33,7 @@
 
 #include "wx/filefn.h"          // for wxDirExists()
 #include "wx/filename.h"
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 // ----------------------------------------------------------------------------
 // private classes

src/osx/carbon/dnd.cpp

@@ -21,7 +21,7 @@
     #include "wx/gdicmn.h"
 #endif // WX_PRECOMP
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 // ----------------------------------------------------------------------------
 // globals

src/osx/carbon/drawer.cpp

@@ -14,11 +14,11 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 #if defined( __WXMAC__ )
 
-#include "wx/mac/carbon/drawer.h"
+#include "wx/osx/carbon/drawer.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxDrawerWindow, wxWindow)
 

src/osx/carbon/filedlg.cpp

@@ -25,7 +25,7 @@
 #include "wx/tokenzr.h"
 #include "wx/filename.h"
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 #ifndef __DARWIN__
     #include <Navigation.h>

src/osx/carbon/font.cpp

@@ -25,7 +25,7 @@
 #include "wx/graphics.h"
 #include "wx/settings.h"
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 #ifndef __DARWIN__
 #include <ATSUnicode.h>

src/osx/carbon/fontdlg.cpp

@@ -46,7 +46,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 // ---------------------------------------------------------------------------
 // wxFontDialog
@@ -261,7 +261,7 @@ int wxFontDialog::ShowModal()
 
 #undef wxFontDialog
 
-#include "wx/mac/fontdlg.h"
+#include "wx/osx/fontdlg.h"
 
 #include "wx/fontenum.h"
 #include "wx/colordlg.h"

src/osx/carbon/fontdlgosx.mm

@@ -42,7 +42,7 @@
 #import <Foundation/Foundation.h>
 #import <AppKit/AppKit.h>
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 @interface wxMacFontPanelAccView : NSView
 {

src/osx/carbon/fontenum.cpp

@@ -25,7 +25,7 @@
 #include "wx/fontmap.h"
 #include "wx/encinfo.h"
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 // ----------------------------------------------------------------------------
 // wxFontEnumerator

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)

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,

src/osx/carbon/gdiobj.cpp

@@ -19,7 +19,7 @@
 #endif
 
 #include "wx/link.h"
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 // Linker will discard entire object file without this
 wxFORCE_LINK_THIS_MODULE(gdiobj)

src/osx/carbon/glcanvas.cpp

@@ -33,9 +33,9 @@
     #include "wx/settings.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 // ----------------------------------------------------------------------------
 // helper functions

src/osx/carbon/graphics.cpp

@@ -35,12 +35,12 @@
 #endif
 
 #ifdef __WXMAC__
-    #include "wx/mac/uma.h"
+    #include "wx/osx/uma.h"
-    #include "wx/mac/dcprint.h"
+    #include "wx/osx/dcprint.h"
 #else
     #include "CoreServices/CoreServices.h"
     #include "ApplicationServices/ApplicationServices.h"
-    #include "wx/mac/corefoundation/cfstring.h"
+    #include "wx/osx/core/cfstring.h"
     #include "wx/cocoa/dcclient.h"
 #endif
 

src/osx/carbon/icon.cpp

@@ -17,7 +17,7 @@
     #include "wx/image.h"
 #endif
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject)
 

src/osx/carbon/listbox.cpp

@@ -29,7 +29,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 END_EVENT_TABLE()
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 // ============================================================================
 // list box control implementation

src/osx/carbon/listctrl_mac.cpp

@@ -33,7 +33,7 @@
     #include "wx/settings.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 #include "wx/imaglist.h"
 #include "wx/sysopt.h"

src/osx/carbon/mdi.cpp

@@ -22,8 +22,8 @@
     #include "wx/statusbr.h"
 #endif
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)

src/osx/carbon/mediactrl.cpp

@@ -46,7 +46,7 @@
 #endif
 
 // uma is for wxMacFSSpec
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 // standard QT stuff
 #ifndef __DARWIN__

src/osx/carbon/menu.cpp

@@ -28,7 +28,7 @@
     #include "wx/menuitem.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 // other standard headers
 // ----------------------

src/osx/carbon/menuitem.cpp

@@ -19,7 +19,7 @@
     #include "wx/menu.h"
 #endif // WX_PRECOMP
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
 

src/osx/carbon/metafile.cpp

@@ -24,9 +24,9 @@
 
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 #include "wx/graphics.h"
-#include "wx/mac/carbon/metafile.h"
+#include "wx/osx/carbon/metafile.h"
 
 #include <stdio.h>
 #include <string.h>

src/osx/carbon/mimetmac.cpp

@@ -32,7 +32,7 @@
 
 #if wxUSE_MIMETYPE
 
-#include "wx/mac/mimetype.h"
+#include "wx/osx/mimetype.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
@@ -48,7 +48,7 @@
 #include "wx/file.h"
 #include "wx/confbase.h"
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 // other standard headers
 #include <ctype.h>
@@ -752,7 +752,7 @@ pascal  OSStatus  MoreProcGetProcessTypeSignature(
 //
 //
 
-#include "wx/mac/corefoundation/cfstring.h"
+#include "wx/osx/core/cfstring.h"
 
 #define wxCF_RELEASE true
 #define wxCF_RETAIN  false

src/osx/carbon/msgdlg.cpp

@@ -19,7 +19,7 @@
 #endif
 
 #include "wx/thread.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)

src/osx/carbon/nonownedwnd.cpp

@@ -20,7 +20,7 @@
 #include "wx/tooltip.h"
 #include "wx/nonownedwnd.h"
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 #include "wx/settings.h"
 #include "wx/frame.h"
 

src/osx/carbon/notebmac.cpp

@@ -24,7 +24,7 @@
 
 #include "wx/string.h"
 #include "wx/imaglist.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 
 // check that the page index is valid

src/osx/carbon/popupwin.cpp

@@ -34,7 +34,7 @@
 #include "wx/popupwin.h"
 #include "wx/tooltip.h"
 
-#include "wx/mac/private.h"    
+#include "wx/osx/private.h"    
 
 // ============================================================================
 // implementation

src/osx/carbon/printdlg.cpp

@@ -24,9 +24,9 @@
     #include "wx/stattext.h"
 #endif
 
-#include "wx/mac/printdlg.h"
+#include "wx/osx/printdlg.h"
-#include "wx/mac/private/print.h"
+#include "wx/osx/private/print.h"
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 #include "wx/statline.h"
 
 

src/osx/carbon/printmac.cpp

@@ -27,14 +27,14 @@
     #include "wx/math.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
-#include "wx/mac/printmac.h"
+#include "wx/osx/printmac.h"
-#include "wx/mac/private/print.h"
+#include "wx/osx/private/print.h"
 
 #include "wx/printdlg.h"
 #include "wx/paper.h"
-#include "wx/mac/printdlg.h"
+#include "wx/osx/printdlg.h"
 
 #include <stdlib.h>
 

src/osx/carbon/radiobox.cpp

@@ -20,7 +20,7 @@
     #include "wx/arrstr.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
 

src/osx/carbon/radiobut.cpp

@@ -14,7 +14,7 @@
 #if wxUSE_RADIOBTN
 
 #include "wx/radiobut.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 

src/osx/carbon/region.cpp

@@ -16,7 +16,7 @@
     #include "wx/gdicmn.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)

src/osx/carbon/renderer.cpp

@@ -27,7 +27,7 @@
 
 #include "wx/renderer.h"
 #include "wx/graphics.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 
 class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative

src/osx/carbon/scrolbar.cpp

@@ -19,7 +19,7 @@
     #include "wx/settings.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 

src/osx/carbon/settings.cpp

@@ -18,7 +18,7 @@
     #include "wx/gdicmn.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 // ----------------------------------------------------------------------------
 // wxSystemSettingsNative

src/osx/carbon/slider.cpp

@@ -14,7 +14,7 @@
 #if wxUSE_SLIDER
 
 #include "wx/slider.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 

src/osx/carbon/sound.cpp

@@ -45,7 +45,7 @@
 //
 
 #ifdef __WXMAC__
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 #ifndef __DARWIN__
 #include <Movies.h>
 #include <Gestalt.h>

src/osx/carbon/spinbutt.cpp

@@ -14,7 +14,7 @@
 #if wxUSE_SPINBTN
 
 #include "wx/spinbutt.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)

src/osx/carbon/srchctrl.cpp

@@ -25,8 +25,8 @@
 
 #if wxUSE_NATIVE_SEARCH_CONTROL
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
-#include "wx/mac/carbon/private/mactext.h"
+#include "wx/osx/carbon/private/mactext.h"
 
 BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
 END_EVENT_TABLE()

src/osx/carbon/statbox.cpp

@@ -14,7 +14,7 @@
 #if wxUSE_STATBOX
 
 #include "wx/statbox.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 

src/osx/carbon/statbrma.cpp

@@ -21,7 +21,7 @@
     #include "wx/toplevel.h"
 #endif
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 
 BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric)

src/osx/carbon/statlmac.cpp

@@ -31,7 +31,7 @@
     #include "wx/statbox.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 // ============================================================================
 // implementation

src/osx/carbon/stattext.cpp

@@ -26,7 +26,7 @@
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 #include <stdio.h>
 

src/osx/carbon/tabctrl.cpp

@@ -19,7 +19,7 @@
     #include "wx/control.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxNotifyEvent)

src/osx/carbon/taskbar.cpp

@@ -22,7 +22,7 @@
     #include "wx/icon.h"
 #endif
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 class wxTaskBarIconImpl
 {

src/osx/carbon/textctrl.cpp

@@ -46,8 +46,8 @@
 #include "wx/sysopt.h"
 #include "wx/thread.h"
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
-#include "wx/mac/carbon/private/mactext.h"
+#include "wx/osx/carbon/private/mactext.h"
 
 class wxMacFunctor
 {

src/osx/carbon/tglbtn.cpp

@@ -23,7 +23,7 @@
 #if wxUSE_TOGGLEBTN
 
 #include "wx/tglbtn.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 // Button
 
 // ----------------------------------------------------------------------------

src/osx/carbon/thread.cpp

@@ -26,7 +26,7 @@
 #include "wx/thread.h"
 
 #include <CoreServices/CoreServices.h>
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 // the possible states of the thread:
 // ("=>" shows all possible transitions from this state)

src/osx/carbon/timer.cpp

@@ -17,10 +17,10 @@
     #include "wx/dynarray.h"
 #endif
 
-#include "wx/mac/private/timer.h"
+#include "wx/osx/private/timer.h"
 
 #ifdef __WXMAC__
-    #include "wx/mac/private.h"
+    #include "wx/osx/private.h"
 #endif
 
 struct MacTimerInfo

src/osx/carbon/toolbar.cpp

@@ -20,7 +20,7 @@
 #endif
 
 #include "wx/app.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 #include "wx/geometry.h"
 #include "wx/sysopt.h"
 

src/osx/carbon/tooltip.cpp

@@ -21,7 +21,7 @@
 #endif // WX_PRECOMP
 
 #include "wx/geometry.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 //-----------------------------------------------------------------------------
 // global data

src/osx/carbon/toplevel.cpp

@@ -37,7 +37,7 @@
     #include "wx/control.h"
 #endif //WX_PRECOMP
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 #include "wx/tooltip.h"
 #include "wx/dnd.h"
 
@@ -50,7 +50,7 @@
 #endif
 
 // for targeting OSX
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 // ============================================================================
 // wxTopLevelWindowMac implementation

src/osx/carbon/uma.cpp

@@ -11,14 +11,14 @@
 
 #include "wx/wxprec.h"
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 #if wxUSE_GUI
 
 #include "wx/toplevel.h"
 #include "wx/dc.h"
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 static SInt32 sUMASystemVersion = 0 ;
 

src/osx/carbon/utils.cpp

@@ -25,7 +25,7 @@
 #include "wx/apptrait.h"
 
 #if wxUSE_GUI
-    #include "wx/mac/uma.h"
+    #include "wx/osx/uma.h"
 #endif
 
 #include <ctype.h>
@@ -44,11 +44,11 @@
 #if wxUSE_GUI
     #include <CoreServices/CoreServices.h>
     #include <Carbon/Carbon.h>
-    #include "wx/mac/private/timer.h"
+    #include "wx/osx/private/timer.h"
 #endif // wxUSE_GUI
 
 #include "wx/evtloop.h"
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 #if defined(__MWERKS__) && wxUSE_UNICODE
 #if __MWERKS__ < 0x4100

src/osx/carbon/utilscocoa.mm

@@ -14,7 +14,7 @@
 #include <Cocoa/Cocoa.h>
 
 #ifdef __WXMAC__
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 #endif
 
 #ifdef __WXMAC__

src/osx/carbon/window.cpp

@@ -61,7 +61,7 @@
 #include "wx/dnd.h"
 #endif
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 #define MAC_SCROLLBAR_SIZE 15
 #define MAC_SMALL_SCROLLBAR_SIZE 11