fixing file paths after renaming

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

diff --git a/src/osx/carbon/aboutdlg.cpp b/src/osx/carbon/aboutdlg.cpp
index 243de8b7d7b2a1a69358fdf82a8d417ba4ca8b01..eca978068f54d049dc5d1957f7cdcbfa2b1d5a34 100644 (file)
--- a/src/osx/carbon/aboutdlg.cpp
+++ b/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>

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index a75a5112791edbd1017e102887922ca70e09cd54..17fde1212d8d605b4b65fd38ee330a605bf8d89a 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/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>

diff --git a/src/osx/carbon/bitmap.cpp b/src/osx/carbon/bitmap.cpp
index 1183eb0fbb216a5a693f65d7a696bb267656394b..42242ccbfa24bcecff9f356453bc9bffb71172e6 100644 (file)
--- a/src/osx/carbon/bitmap.cpp
+++ b/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

diff --git a/src/osx/carbon/bmpbuttn.cpp b/src/osx/carbon/bmpbuttn.cpp
index 5757f50b845b2d53d27771ddaa4418e4039af97d..36512500e32da4e720ef3bdc422d7c74ad8252e5 100644 (file)
--- a/src/osx/carbon/bmpbuttn.cpp
+++ b/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

diff --git a/src/osx/carbon/brush.cpp b/src/osx/carbon/brush.cpp
index 84dd60d6e9b4ccc0473f710e7888c8478f3f3bbb..d7ec6a33694e45d4a21626e472673b95acb80bdb 100644 (file)
--- a/src/osx/carbon/brush.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/button.cpp b/src/osx/carbon/button.cpp
index 87fa56c82bc0f5bc6f86603b175f066e94fac100..021ddac1120cb0a597e63a5e34676c665e5c9aa5 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)
 

diff --git a/src/osx/carbon/cfsocket.cpp b/src/osx/carbon/cfsocket.cpp
index 8a2383c7f5772a075bbf356a0cc7310a42f04f10..480a061840558a69a39ae9e8c68246785b90d2d2 100644 (file)
--- a/src/osx/carbon/cfsocket.cpp
+++ b/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>

diff --git a/src/osx/carbon/checkbox.cpp b/src/osx/carbon/checkbox.cpp
index 982869b0aa036aeb7fea21f34bb419859da332ec..ccb5ab2afb9610a2c458adbd82c93e0165e23164 100644 (file)
--- a/src/osx/carbon/checkbox.cpp
+++ b/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)

diff --git a/src/osx/carbon/checklst.cpp b/src/osx/carbon/checklst.cpp
index 5f0fecb5e2eb434db3128a4d12cf540b4a550c60..adff768e253866b45f1902abcb8801240ce636a7 100644 (file)
--- a/src/osx/carbon/checklst.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/choice.cpp b/src/osx/carbon/choice.cpp
index c395a39d19fdbc1a0789df384035195a4d00d510..c0bd7f8abedf157b296f50d7f510a26010b52db9 100644 (file)
--- a/src/osx/carbon/choice.cpp
+++ b/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() ;
 

diff --git a/src/osx/carbon/clipbrd.cpp b/src/osx/carbon/clipbrd.cpp
index 7acd5845f44dc2ad6d9a7d049a1c5d47aba5be60..c05e24d120d2291059a60f0308f49ec94105e7ae 100644 (file)
--- a/src/osx/carbon/clipbrd.cpp
+++ b/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
 

diff --git a/src/osx/carbon/colordlg.cpp b/src/osx/carbon/colordlg.cpp
index 377276d0c4e42631522d236234ddc9187d722817..1fe4e3d1519001a6be37500c11ea2239c0ddc835 100644 (file)
--- a/src/osx/carbon/colordlg.cpp
+++ b/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

diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm
index ea058c24f73200b10688b6d275fd0d7b7e06ab86..4c6f3a3ad85902ed8a9ad41b4cb858a68bea1829 100644 (file)
--- a/src/osx/carbon/colordlgosx.mm
+++ b/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"
 
 // ============================================================================

diff --git a/src/osx/carbon/colour.cpp b/src/osx/carbon/colour.cpp
index 9eb24718a37dbff16b09c867e2c3b7c96093cca0..f46a19e9e75f04b1f324d19757728768c0127564 100644 (file)
--- a/src/osx/carbon/colour.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/combobox.cpp b/src/osx/carbon/combobox.cpp
index 90ba52c9c8e123e4fa76ddfbc84f3677b28485f9..1174358e298f91782f832460c11b4c65fdf95b00 100644 (file)
--- a/src/osx/carbon/combobox.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/combobxc.cpp b/src/osx/carbon/combobxc.cpp
index c494f9fada09cd27183ec68413b8ba48b0eebe9c..8a67fd323fe165d292af45532e4455b7501a44f3 100644 (file)
--- a/src/osx/carbon/combobxc.cpp
+++ b/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>

diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp
index f787ea9812d4227ae42c1fbd3a333826a45c2162..e8874e6a8c244f1eb83c4df670c2d8729e4f21e7 100644 (file)
--- a/src/osx/carbon/control.cpp
+++ b/src/osx/carbon/control.cpp
@@ -31,8 +31,8 @@
 #include "wx/tabctrl.h"
 #include "wx/spinbutt.h"
 
-#include "wx/mac/uma.h"
-#include "wx/mac/private.h"
+#include "wx/osx/uma.h"
+#include "wx/osx/private.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 

diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp
index 36e40a7de950883ad3e58c6fd4574fa21cd39f1e..af2f32a726da8553e218908584e9eb3b69d0b2a9 100644 (file)
--- a/src/osx/carbon/cursor.cpp
+++ b/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)

diff --git a/src/osx/carbon/databrow.cpp b/src/osx/carbon/databrow.cpp
index 6d4e55cc5bb01bd3003ffa840ee13c0afa5cff91..33a9a582eccc5bb633152b4143133d4abd6127b2 100644 (file)
--- a/src/osx/carbon/databrow.cpp
+++ b/src/osx/carbon/databrow.cpp
@@ -23,9 +23,9 @@
 #endif
 
 #include "wx/dataview.h"
-#include "wx/mac/carbon/databrow.h"
-#include "wx/mac/private.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/carbon/databrow.h"
+#include "wx/osx/private.h"
+#include "wx/osx/uma.h"
 
 #include <limits>
 

diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp
index cdec68b05d7028d784a85c4fa2fe733d446ead98..3b9de3922355a0f3c56d5a21dfb79787cd2e33ae 100644 (file)
--- a/src/osx/carbon/dataobj.cpp
+++ b/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>

diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp
index 5dd666c1ca499cc69d2087bf17df29ca30028778..e6435e32fb02d3fc6a07a7415a372a117f4470e8 100644 (file)
--- a/src/osx/carbon/dataview.cpp
+++ b/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"

diff --git a/src/osx/carbon/dcclient.cpp b/src/osx/carbon/dcclient.cpp
index a7f4cb25369dd17cd2dccb79d8f3b11cf9b671a4..00b970dd9a3d7543e89de9d1f7c1993748fcfd10 100644 (file)
--- a/src/osx/carbon/dcclient.cpp
+++ b/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

diff --git a/src/osx/carbon/dcmemory.cpp b/src/osx/carbon/dcmemory.cpp
index 4567352d9407d17a7209d3621786f42e999068a6..e75442fb9cea900a8e5da1d1a4898175ad4d2708 100644 (file)
--- a/src/osx/carbon/dcmemory.cpp
+++ b/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

diff --git a/src/osx/carbon/dcprint.cpp b/src/osx/carbon/dcprint.cpp
index ccc58d99ffcf845534d3988aeffa3b732446948a..7bec2b5eaf1a1bb21a24e24f99354b96fb8610ef 100644 (file)
--- a/src/osx/carbon/dcprint.cpp
+++ b/src/osx/carbon/dcprint.cpp
@@ -25,9 +25,9 @@
     #include "wx/math.h"
 #endif
 
-#include "wx/mac/uma.h"
-#include "wx/mac/private/print.h"
-#include "wx/mac/carbon/dcprint.h"
+#include "wx/osx/uma.h"
+#include "wx/osx/private/print.h"
+#include "wx/osx/carbon/dcprint.h"
 #include "wx/graphics.h"
 
 IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxGCDCImpl)

diff --git a/src/osx/carbon/dcscreen.cpp b/src/osx/carbon/dcscreen.cpp
index ad8ac0be4a413b04a1b2f1dcf5f3358a3558c58d..521f73b3aea85fa4b001664c86b71093ab95dc48 100644 (file)
--- a/src/osx/carbon/dcscreen.cpp
+++ b/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)

diff --git a/src/osx/carbon/dialog.cpp b/src/osx/carbon/dialog.cpp
index 8743e10547df6dec7c4dde3ea3e333b79df154aa..19dbf02e88f6cf9c7a4c50fb837a8bedac2c3be5 100644 (file)
--- a/src/osx/carbon/dialog.cpp
+++ b/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

diff --git a/src/osx/carbon/dirdlg.cpp b/src/osx/carbon/dirdlg.cpp
index 5caa7f6b4bb218fc37308e82dfdbe19e22f721e5..6fc40059c7cc26e60d662efca1a3d2139430bb46 100644 (file)
--- a/src/osx/carbon/dirdlg.cpp
+++ b/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>

diff --git a/src/osx/carbon/dirmac.cpp b/src/osx/carbon/dirmac.cpp
index 52e9a61e0fb3af919c3b7a0d82ca0e6ab4a7c957..06ccef19607a01e84a8ff0067b6a112d8b4b9e5b 100644 (file)
--- a/src/osx/carbon/dirmac.cpp
+++ b/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

diff --git a/src/osx/carbon/dnd.cpp b/src/osx/carbon/dnd.cpp
index 11709e12cecf18ef0cbf57fe2c5d24020ee06e28..b5d299b476fa3a9c2a0e5f24b56407b72d5dbf39 100644 (file)
--- a/src/osx/carbon/dnd.cpp
+++ b/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

diff --git a/src/osx/carbon/drawer.cpp b/src/osx/carbon/drawer.cpp
index 4adb28e239137c342cb0562cd164bf27ffeea377..9c2368fe901309315c573f666117747596d389ce 100644 (file)
--- a/src/osx/carbon/drawer.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/filedlg.cpp b/src/osx/carbon/filedlg.cpp
index 6e438453352e5f4de960aae1c15d2cb953a4439c..b42165fde3264f46b72edf7229bb4bec30ce586b 100644 (file)
--- a/src/osx/carbon/filedlg.cpp
+++ b/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>

diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp
index d069f3c89e996e7e28394dd4c862c609d6a823b3..da34391d86892f81a2ba66f30c56fc15c6c669cc 100644 (file)
--- a/src/osx/carbon/font.cpp
+++ b/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>

diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp
index e7892ad5426ae1b4b81a7f1ccfdd93a3dd298897..07ec5c6f1af8b4a21622d13691a405ced6c6f129 100644 (file)
--- a/src/osx/carbon/fontdlg.cpp
+++ b/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"

diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm
index 55071430b2d9495313fe57fa0026edf1c1947914..b0f144ca59feaa4fe72e93447fbceaa0af0b7550 100644 (file)
--- a/src/osx/carbon/fontdlgosx.mm
+++ b/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
 {

diff --git a/src/osx/carbon/fontenum.cpp b/src/osx/carbon/fontenum.cpp
index ce9718ed10e84c07b042827716d5a6cefe0d1668..3355abf21ee4c66aa876ab84f91e7acbea0997c9 100644 (file)
--- a/src/osx/carbon/fontenum.cpp
+++ b/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

diff --git a/src/osx/carbon/frame.cpp b/src/osx/carbon/frame.cpp
index d17d5d8147f1c04a58c77ed732dee84fe8e52291..fb6b170ae86496682f737dae7c73ff9ffafef31f 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)

diff --git a/src/osx/carbon/gauge.cpp b/src/osx/carbon/gauge.cpp
index b2f36abe9574f69147b0b54f7f9c048ade46d667..57a83ed4f1cbcbc2f81c0a2c18f035f15178d05a 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,

diff --git a/src/osx/carbon/gdiobj.cpp b/src/osx/carbon/gdiobj.cpp
index 76156134e021d06944aa8e76b287e675ec18293e..ad33a80ba9dd34d2bccf9467865b9423c97e9331 100644 (file)
--- a/src/osx/carbon/gdiobj.cpp
+++ b/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)

diff --git a/src/osx/carbon/glcanvas.cpp b/src/osx/carbon/glcanvas.cpp
index 7d265bc1d602b69ae8d97e96d9672b5b1b8288e3..4bfc12cc9e43d5f9540a47d0081183d93accb3db 100644 (file)
--- a/src/osx/carbon/glcanvas.cpp
+++ b/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

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index 3c65a99a8cfc452f6a71a488f536b53b3eea928d..37596e8268e9696370c97effd2e443ebd85844ad 100644 (file)
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -35,12 +35,12 @@
 #endif
 
 #ifdef __WXMAC__
-    #include "wx/mac/uma.h"
-    #include "wx/mac/dcprint.h"
+    #include "wx/osx/uma.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
 

diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp
index c90a0b37c71faa78865d2075c08912042c270c60..38e86abec3fa15e63699136514e305060eb91784 100644 (file)
--- a/src/osx/carbon/icon.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp
index 8c479b10664d7700f34d4fb992e713392f958acf..edd9f96e0fe46628d9db69d40dd36285f6e8be15 100644 (file)
--- a/src/osx/carbon/listbox.cpp
+++ b/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

diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp
index 13a20ac2200f4318dde07d23c6fc9c052949c3d8..64641fae9c080507a7930cb724557ab33d2ef4c6 100644 (file)
--- a/src/osx/carbon/listctrl_mac.cpp
+++ b/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"

diff --git a/src/osx/carbon/mdi.cpp b/src/osx/carbon/mdi.cpp
index ca02c69c0dd53d870ed9174fc55568f348c83998..02b33e5cf66cac7f5c7fab87c490e9f01d5371e1 100644 (file)
--- a/src/osx/carbon/mdi.cpp
+++ b/src/osx/carbon/mdi.cpp
@@ -22,8 +22,8 @@
     #include "wx/statusbr.h"
 #endif
 
-#include "wx/mac/private.h"
-#include "wx/mac/uma.h"
+#include "wx/osx/private.h"
+#include "wx/osx/uma.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)

diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp
index 9d525f5b592f7cd05128652332ff83e1de51d6f7..475d02540aed9b502c9f4f3a88ed35642ac073d4 100644 (file)
--- a/src/osx/carbon/mediactrl.cpp
+++ b/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__

diff --git a/src/osx/carbon/menu.cpp b/src/osx/carbon/menu.cpp
index 9311f4fdb63bfc176cc9055d836128bb5c76a39b..5505797e2d996db413569c5f48091331d497f9e1 100644 (file)
--- a/src/osx/carbon/menu.cpp
+++ b/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
 // ----------------------

diff --git a/src/osx/carbon/menuitem.cpp b/src/osx/carbon/menuitem.cpp
index efe921ff747be6add69372aadf19c757e1a58919..ada8a8be843dfb5e3dd359e2b3991e63d22c31d7 100644 (file)
--- a/src/osx/carbon/menuitem.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/metafile.cpp b/src/osx/carbon/metafile.cpp
index 73d5b77f9ab8a651fa60b7328ac23bbd776dad68..464cd9ae6316d7807e33685a5ae81f83e4a40bcc 100644 (file)
--- a/src/osx/carbon/metafile.cpp
+++ b/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>

diff --git a/src/osx/carbon/mimetmac.cpp b/src/osx/carbon/mimetmac.cpp
index 5f1593ea0572a9445f2b81e56df44aee53c77c26..4bf9a586c24d7bc5d4a2de7195a562b63f8c964c 100644 (file)
--- a/src/osx/carbon/mimetmac.cpp
+++ b/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

diff --git a/src/osx/carbon/msgdlg.cpp b/src/osx/carbon/msgdlg.cpp
index 830efb6f27740063682096a3526395f032bdc183..3adc6bbca4e4a3c56326210e87a72f4c8aa1ddf5 100644 (file)
--- a/src/osx/carbon/msgdlg.cpp
+++ b/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)

diff --git a/src/osx/carbon/nonownedwnd.cpp b/src/osx/carbon/nonownedwnd.cpp
index 4c8d95e72e68e62abc5b5fe95c34a3a56f6dfa5b..6956f30700f7836919c9431422cf5c3e2794dd3b 100644 (file)
--- a/src/osx/carbon/nonownedwnd.cpp
+++ b/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"
 

diff --git a/src/osx/carbon/notebmac.cpp b/src/osx/carbon/notebmac.cpp
index 6d00a7130dfd300c49cd2e47b63aaec4766261cf..5a5504d8f6b50ed55cabd3b67a8c972b30ad1de0 100644 (file)
--- a/src/osx/carbon/notebmac.cpp
+++ b/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

diff --git a/src/osx/carbon/popupwin.cpp b/src/osx/carbon/popupwin.cpp
index c2ecd3cf5988525b8087ca543f00ba320837129e..4889db8958da668ff9c5cbfd03d37eb8444a900e 100644 (file)
--- a/src/osx/carbon/popupwin.cpp
+++ b/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

diff --git a/src/osx/carbon/printdlg.cpp b/src/osx/carbon/printdlg.cpp
index 66d2adf22d142650ebc48f77c2448545d3ea7424..f7d1d1df67e577040844bef526dacf3031444107 100644 (file)
--- a/src/osx/carbon/printdlg.cpp
+++ b/src/osx/carbon/printdlg.cpp
@@ -24,9 +24,9 @@
     #include "wx/stattext.h"
 #endif
 
-#include "wx/mac/printdlg.h"
-#include "wx/mac/private/print.h"
-#include "wx/mac/private.h"
+#include "wx/osx/printdlg.h"
+#include "wx/osx/private/print.h"
+#include "wx/osx/private.h"
 #include "wx/statline.h"
 
 

diff --git a/src/osx/carbon/printmac.cpp b/src/osx/carbon/printmac.cpp
index 6c34d746f951f17040e1f331fc99b10cc5e5a61c..d013871f94b3bca484f700467d0d75917c5ed4f0 100644 (file)
--- a/src/osx/carbon/printmac.cpp
+++ b/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/mac/private/print.h"
+#include "wx/osx/printmac.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>
 

diff --git a/src/osx/carbon/radiobox.cpp b/src/osx/carbon/radiobox.cpp
index 69ce082c1b620fe5dcbfdd41c6f64b8e074aceae..9eae7ec48ac696dcb758bb90505f17ccd48ba21c 100644 (file)
--- a/src/osx/carbon/radiobox.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/radiobut.cpp b/src/osx/carbon/radiobut.cpp
index 7f866d2536a798508dad6b75a2319fbe34c8f573..3fa8079c7bc65c45f5cfe4d36110b8937f785d1b 100644 (file)
--- a/src/osx/carbon/radiobut.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp
index d08fd4984c25b88208ffa5c7bd77738258a6bd85..e645ea9e92f9438b6a274d97640234c9d834bd71 100644 (file)
--- a/src/osx/carbon/region.cpp
+++ b/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)

diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp
index abcc1d6aa2b655e960921e2b1af05663199ec120..8eb4e180e7e0ba05537be7665e1ee5f2155b1424 100644 (file)
--- a/src/osx/carbon/renderer.cpp
+++ b/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

diff --git a/src/osx/carbon/scrolbar.cpp b/src/osx/carbon/scrolbar.cpp
index c7c1263451387280267f40ea5cfe4fdc9071b4c7..fbf084395c6cb96e2bc75b6248f485708d57df26 100644 (file)
--- a/src/osx/carbon/scrolbar.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/settings.cpp b/src/osx/carbon/settings.cpp
index 58cecfb357174b30e14fb849aac5fbe6f4929e9e..ae7625872cfb0f2ae6a2c05248b78b2316e2f351 100644 (file)
--- a/src/osx/carbon/settings.cpp
+++ b/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

diff --git a/src/osx/carbon/slider.cpp b/src/osx/carbon/slider.cpp
index ced51f397ee2a03bc21a84303636e37011f4617e..d79fe630c2da169dfc7c05d4a0af596e9b58c538 100644 (file)
--- a/src/osx/carbon/slider.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/sound.cpp b/src/osx/carbon/sound.cpp
index b3ff384fc86d9544d2b81cede45cca6357e8de31..ca532ebab56366b25026dd94e602d0e5a05815e8 100644 (file)
--- a/src/osx/carbon/sound.cpp
+++ b/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>

diff --git a/src/osx/carbon/spinbutt.cpp b/src/osx/carbon/spinbutt.cpp
index 02ed2e94236554e9df69b0117da7159573faa2ac..16bd9e489287dd247f4739b30fedd0b918a2de0c 100644 (file)
--- a/src/osx/carbon/spinbutt.cpp
+++ b/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)

diff --git a/src/osx/carbon/srchctrl.cpp b/src/osx/carbon/srchctrl.cpp
index 4a786293913a22b3ef4df5c668325bd21a9f9642..24919560de5a9e98548e1fd1ce2909b855dad1ba 100644 (file)
--- a/src/osx/carbon/srchctrl.cpp
+++ b/src/osx/carbon/srchctrl.cpp
@@ -25,8 +25,8 @@
 
 #if wxUSE_NATIVE_SEARCH_CONTROL
 
-#include "wx/mac/uma.h"
-#include "wx/mac/carbon/private/mactext.h"
+#include "wx/osx/uma.h"
+#include "wx/osx/carbon/private/mactext.h"
 
 BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
 END_EVENT_TABLE()

diff --git a/src/osx/carbon/statbox.cpp b/src/osx/carbon/statbox.cpp
index 398fc5fcb2fa2e334f52cdac09170651d6d423f3..a7eec879bb76051d815d71c9f0015c6bcf5f82ea 100644 (file)
--- a/src/osx/carbon/statbox.cpp
+++ b/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)
 

diff --git a/src/osx/carbon/statbrma.cpp b/src/osx/carbon/statbrma.cpp
index 926198c3b01fec141afb82dd644817443714ef23..ba190b0df328066297bf1480b09c5396bd335bd5 100644 (file)
--- a/src/osx/carbon/statbrma.cpp
+++ b/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)

diff --git a/src/osx/carbon/statlmac.cpp b/src/osx/carbon/statlmac.cpp
index d0102cc8c3b46ed4dc7d1dfdecfbaa3bb4755717..2b74eb9912b8ee5f3dcf6b81f31cc478afc5a24b 100644 (file)
--- a/src/osx/carbon/statlmac.cpp
+++ b/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

diff --git a/src/osx/carbon/stattext.cpp b/src/osx/carbon/stattext.cpp
index d0285e6b065092b7e5d050259d7887ea90e20a56..6763b3afeee214e070582402ec3dc98ece3de07a 100644 (file)
--- a/src/osx/carbon/stattext.cpp
+++ b/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>
 

diff --git a/src/osx/carbon/tabctrl.cpp b/src/osx/carbon/tabctrl.cpp
index bd557b762d77ef0bc1aaa4c3d8a716a4d566cec4..a55c65dfde937b24feae5a63188ded2e86271379 100644 (file)
--- a/src/osx/carbon/tabctrl.cpp
+++ b/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)

diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp
index 9bb02f5124e0c73dcf2e9e8bea5b6770ec381d98..b2f00b26adb37f0bde9bb6a71add91f01c3cc07f 100644 (file)
--- a/src/osx/carbon/taskbar.cpp
+++ b/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
 {

diff --git a/src/osx/carbon/textctrl.cpp b/src/osx/carbon/textctrl.cpp
index b162a58860088dfac34e19148f5f1615c943e413..3b21030e01d2b74e7a865c76ed996a7dc9138417 100644 (file)
--- a/src/osx/carbon/textctrl.cpp
+++ b/src/osx/carbon/textctrl.cpp
@@ -46,8 +46,8 @@
 #include "wx/sysopt.h"
 #include "wx/thread.h"
 
-#include "wx/mac/uma.h"
-#include "wx/mac/carbon/private/mactext.h"
+#include "wx/osx/uma.h"
+#include "wx/osx/carbon/private/mactext.h"
 
 class wxMacFunctor
 {

diff --git a/src/osx/carbon/tglbtn.cpp b/src/osx/carbon/tglbtn.cpp
index 43904685f75eea567acda18bac18fb7c66d036eb..ced569714d19361fcc86e1a375bb1995c7d5a0c3 100644 (file)
--- a/src/osx/carbon/tglbtn.cpp
+++ b/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
 
 // ----------------------------------------------------------------------------

diff --git a/src/osx/carbon/thread.cpp b/src/osx/carbon/thread.cpp
index 04383b0f9478878676167e247fc3df36c570d27f..6d23905e80f29ff85ee4d09bdf29eb715c99e3f9 100644 (file)
--- a/src/osx/carbon/thread.cpp
+++ b/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)

diff --git a/src/osx/carbon/timer.cpp b/src/osx/carbon/timer.cpp
index c5beb16cf12f28cefd0cdf0a2f471f2dfab5daee..4ed70d9c93c242a2995b291996554f1a55328645 100644 (file)
--- a/src/osx/carbon/timer.cpp
+++ b/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

diff --git a/src/osx/carbon/toolbar.cpp b/src/osx/carbon/toolbar.cpp
index f0364473c9e9ec04616b203960a9a7802c7d9a1e..9ff9f29cbfd6ce51dda25c3a57872787a2e7ab40 100644 (file)
--- a/src/osx/carbon/toolbar.cpp
+++ b/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"
 

diff --git a/src/osx/carbon/tooltip.cpp b/src/osx/carbon/tooltip.cpp
index 957feb0491c6f0194b21f7b18b3ae4b721f0724b..dadf0b2ef0f1bc1fccd1a328cc9f8380a65e04df 100644 (file)
--- a/src/osx/carbon/tooltip.cpp
+++ b/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

diff --git a/src/osx/carbon/toplevel.cpp b/src/osx/carbon/toplevel.cpp
index 92243b278de9798a1c8c764517118a87fcf0736f..fff13c351c93fb3f2d656e84e0cdc3b4360fedbc 100644 (file)
--- a/src/osx/carbon/toplevel.cpp
+++ b/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

diff --git a/src/osx/carbon/uma.cpp b/src/osx/carbon/uma.cpp
index 634ea0e03ff2bc4ef3118274810381fbb00e97fc..45610c21bf0685642f22ce8c4ae03aafa2ca3854 100644 (file)
--- a/src/osx/carbon/uma.cpp
+++ b/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 ;
 

diff --git a/src/osx/carbon/utils.cpp b/src/osx/carbon/utils.cpp
index b690bac88946b3ba489754845f85049598c22804..4192588d15ea3d469d07809e5b6beb1801e2e270 100644 (file)
--- a/src/osx/carbon/utils.cpp
+++ b/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

diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index e2ac95f9e6e4ebc9d0b3ff129742c9d1648aed8a..07c34d5630da3fb602f5e46c6b6ca79cef587119 100644 (file)
--- a/src/osx/carbon/utilscocoa.mm
+++ b/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__

diff --git a/src/osx/carbon/window.cpp b/src/osx/carbon/window.cpp
index 9a37721407f784cbbf29b311f672d216618db10c..20619b2b08e1132dea22aa885263bf317adaec48 100644 (file)
--- a/src/osx/carbon/window.cpp
+++ b/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