fixing file paths after renaming

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-11 19:17:41 +00:00
parent 8dd7fd4e5d
commit ef0e92205a
170 changed files with 260 additions and 257 deletions
--- a/include/wx/osx/accel.h
+++ b/include/wx/osx/accel.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/accel.h"
+#include "wx/osx/classic/accel.h"
 #else
-#include "wx/mac/carbon/accel.h"
+#include "wx/osx/carbon/accel.h"
 #endif
--- a/include/wx/osx/app.h
+++ b/include/wx/osx/app.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/app.h"
+#include "wx/osx/classic/app.h"
 #else
-#include "wx/mac/carbon/app.h"
+#include "wx/osx/carbon/app.h"
 #endif
--- a/include/wx/osx/bitmap.h
+++ b/include/wx/osx/bitmap.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/bitmap.h"
+#include "wx/osx/classic/bitmap.h"
 #else
-#include "wx/mac/carbon/bitmap.h"
+#include "wx/osx/carbon/bitmap.h"
 #endif
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/bmpbuttn.h"
+#include "wx/osx/classic/bmpbuttn.h"
 #else
-#include "wx/mac/carbon/bmpbuttn.h"
+#include "wx/osx/carbon/bmpbuttn.h"
 #endif
--- a/include/wx/osx/brush.h
+++ b/include/wx/osx/brush.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/brush.h"
+#include "wx/osx/classic/brush.h"
 #else
-#include "wx/mac/carbon/brush.h"
+#include "wx/osx/carbon/brush.h"
 #endif
--- a/include/wx/osx/button.h
+++ b/include/wx/osx/button.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/button.h"
+#include "wx/osx/classic/button.h"
 #else
-#include "wx/mac/carbon/button.h"
+#include "wx/osx/carbon/button.h"
 #endif
--- a/include/wx/osx/carbon/clipbrd.h
+++ b/include/wx/osx/carbon/clipbrd.h
@@ -21,7 +21,7 @@
 #include "wx/module.h"
 #include "wx/dataobj.h"     // for wxDataFormat

-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"

 //-----------------------------------------------------------------------------
 // wxClipboard
--- a/include/wx/osx/carbon/colour.h
+++ b/include/wx/osx/carbon/colour.h
@@ -15,7 +15,7 @@
 #include "wx/object.h"
 #include "wx/string.h"

-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"

 struct RGBColor;

--- a/include/wx/osx/carbon/databrow.h
+++ b/include/wx/osx/carbon/databrow.h
@@ -16,7 +16,7 @@

 #if wxUSE_GUI

-#include "wx/mac/private.h"
+#include "wx/osx/private.h"

 WX_DEFINE_ARRAY_SIZE_T(size_t,wxArrayDataBrowserItemID);

--- a/include/wx/osx/carbon/dcmemory.h
+++ b/include/wx/osx/carbon/dcmemory.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_

-#include "wx/mac/carbon/dcclient.h"
+#include "wx/osx/carbon/dcclient.h"

 class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
 {
--- a/include/wx/osx/carbon/dcscreen.h
+++ b/include/wx/osx/carbon/dcscreen.h
@@ -13,7 +13,7 @@
 #define _WX_DCSCREEN_H_

 #include "wx/dcclient.h"
-#include "wx/mac/carbon/dcclient.h"
+#include "wx/osx/carbon/dcclient.h"

 class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxWindowDCImpl
 {
--- a/include/wx/osx/carbon/metafile.h
+++ b/include/wx/osx/carbon/metafile.h
@@ -22,7 +22,7 @@
 #include "wx/dataobj.h"
 #endif

-#include "wx/mac/carbon/dcclient.h"
+#include "wx/osx/carbon/dcclient.h"

 /*
 * Metafile and metafile device context classes
--- a/include/wx/osx/carbon/private.h
+++ b/include/wx/osx/carbon/private.h
@@ -18,8 +18,8 @@

 #include <Carbon/Carbon.h>

-#include "wx/mac/corefoundation/cfstring.h"
-#include "wx/mac/corefoundation/cfdataref.h"
+#include "wx/osx/core/cfstring.h"
+#include "wx/osx/core/cfdataref.h"

 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
 typedef UInt32 URefCon;
@@ -29,9 +29,9 @@ typedef SInt32 SRefCon;
 #if wxUSE_GUI

 #include "wx/listbox.h"
-#include "wx/mac/carbon/dc.h"
-#include "wx/mac/carbon/dcclient.h"
-#include "wx/mac/carbon/dcmemory.h"
+#include "wx/osx/carbon/dc.h"
+#include "wx/osx/carbon/dcclient.h"
+#include "wx/osx/carbon/dcmemory.h"

 class WXDLLIMPEXP_CORE wxMacCGContextStateSaver
 {
--- a/include/wx/osx/carbon/private/mactext.h
+++ b/include/wx/osx/carbon/private/mactext.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MAC_PRIVATE_MACTEXT_H_
 #define _WX_MAC_PRIVATE_MACTEXT_H_

-#include "wx/mac/private.h"
+#include "wx/osx/private.h"

 // common interface for all implementations
 class wxMacTextControl : public wxMacControl
--- a/include/wx/osx/carbon/private/overlay.h
+++ b/include/wx/osx/carbon/private/overlay.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MAC_CARBON_PRIVATE_OVERLAY_H_
 #define _WX_MAC_CARBON_PRIVATE_OVERLAY_H_

-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 #include "wx/toplevel.h"
 #include "wx/graphics.h"

--- a/include/wx/osx/carbon/uma.h
+++ b/include/wx/osx/carbon/uma.h
@@ -12,7 +12,7 @@
 #ifndef H_UMA
 #define H_UMA

-#include "wx/mac/private.h"
+#include "wx/osx/private.h"

 void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ;
 long UMAGetSystemVersion() ;
--- a/include/wx/osx/checkbox.h
+++ b/include/wx/osx/checkbox.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/checkbox.h"
+#include "wx/osx/classic/checkbox.h"
 #else
-#include "wx/mac/carbon/checkbox.h"
+#include "wx/osx/carbon/checkbox.h"
 #endif
--- a/include/wx/osx/checklst.h
+++ b/include/wx/osx/checklst.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/checklst.h"
+#include "wx/osx/classic/checklst.h"
 #else
-#include "wx/mac/carbon/checklst.h"
+#include "wx/osx/carbon/checklst.h"
 #endif
--- a/include/wx/osx/chkconf.h
+++ b/include/wx/osx/chkconf.h
@@ -28,7 +28,7 @@
 #endif /* wxUSE_STACKWALKER */

 #ifdef __WXMAC_CLASSIC__
-#   include "wx/mac/classic/chkconf.h"
+#   include "wx/osx/classic/chkconf.h"
 #else
-#   include "wx/mac/carbon/chkconf.h"
+#   include "wx/osx/carbon/chkconf.h"
 #endif
--- a/include/wx/osx/choice.h
+++ b/include/wx/osx/choice.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/choice.h"
+#include "wx/osx/classic/choice.h"
 #else
-#include "wx/mac/carbon/choice.h"
+#include "wx/osx/carbon/choice.h"
 #endif
--- a/include/wx/osx/clipbrd.h
+++ b/include/wx/osx/clipbrd.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/clipbrd.h"
+#include "wx/osx/classic/clipbrd.h"
 #else
-#include "wx/mac/carbon/clipbrd.h"
+#include "wx/osx/carbon/clipbrd.h"
 #endif
--- a/include/wx/osx/colordlg.h
+++ b/include/wx/osx/colordlg.h
@@ -1,6 +1,6 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/colordlg.h"
+#include "wx/osx/classic/colordlg.h"
 #else
-#include "wx/mac/carbon/colordlg.h"
+#include "wx/osx/carbon/colordlg.h"
 #endif

--- a/include/wx/osx/colour.h
+++ b/include/wx/osx/colour.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/colour.h"
+#include "wx/osx/classic/colour.h"
 #else
-#include "wx/mac/carbon/colour.h"
+#include "wx/osx/carbon/colour.h"
 #endif
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/combobox.h"
+#include "wx/osx/classic/combobox.h"
 #else
-#include "wx/mac/carbon/combobox.h"
+#include "wx/osx/carbon/combobox.h"
 #endif
--- a/include/wx/osx/control.h
+++ b/include/wx/osx/control.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/control.h"
+#include "wx/osx/classic/control.h"
 #else
-#include "wx/mac/carbon/control.h"
+#include "wx/osx/carbon/control.h"
 #endif
--- a/include/wx/osx/core/cfdataref.h
+++ b/include/wx/osx/core/cfdataref.h
@@ -16,7 +16,7 @@
 #ifndef _WX_MAC_COREFOUNDATION_CFDATAREF_H__
 #define _WX_MAC_COREFOUNDATION_CFDATAREF_H__

-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"

 #include <CoreFoundation/CFData.h>

--- a/include/wx/osx/core/cfstring.h
+++ b/include/wx/osx/core/cfstring.h
@@ -17,7 +17,7 @@

 #include "wx/dlimpexp.h"
 #include "wx/fontenc.h"
-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"

 class WXDLLIMPEXP_FWD_BASE wxString;

--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -18,8 +18,8 @@

 #include <CoreFoundation/CoreFoundation.h>

-#include "wx/mac/corefoundation/cfstring.h"
-#include "wx/mac/corefoundation/cfdataref.h"
+#include "wx/osx/core/cfstring.h"
+#include "wx/osx/core/cfdataref.h"

 #if wxUSE_GUI

--- a/include/wx/osx/cursor.h
+++ b/include/wx/osx/cursor.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/cursor.h"
+#include "wx/osx/classic/cursor.h"
 #else
-#include "wx/mac/carbon/cursor.h"
+#include "wx/osx/carbon/cursor.h"
 #endif
--- a/include/wx/osx/dataform.h
+++ b/include/wx/osx/dataform.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dataform.h"
+#include "wx/osx/classic/dataform.h"
 #else
-#include "wx/mac/carbon/dataform.h"
+#include "wx/osx/carbon/dataform.h"
 #endif
--- a/include/wx/osx/dataobj.h
+++ b/include/wx/osx/dataobj.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dataobj.h"
+#include "wx/osx/classic/dataobj.h"
 #else
-#include "wx/mac/carbon/dataobj.h"
+#include "wx/osx/carbon/dataobj.h"
 #endif
--- a/include/wx/osx/dataobj2.h
+++ b/include/wx/osx/dataobj2.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dataobj2.h"
+#include "wx/osx/classic/dataobj2.h"
 #else
-#include "wx/mac/carbon/dataobj2.h"
+#include "wx/osx/carbon/dataobj2.h"
 #endif
--- a/include/wx/osx/dataview.h
+++ b/include/wx/osx/dataview.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
 #  error "Native wxDataViewCtrl for classic environment not defined. Please use generic control."
 #else
-#  include "wx/mac/carbon/dataview.h"
+#  include "wx/osx/carbon/dataview.h"
 #endif
--- a/include/wx/osx/dc.h
+++ b/include/wx/osx/dc.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dc.h"
+#include "wx/osx/classic/dc.h"
 #else
-#include "wx/mac/carbon/dc.h"
+#include "wx/osx/carbon/dc.h"
 #endif
--- a/include/wx/osx/dcclient.h
+++ b/include/wx/osx/dcclient.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dcclient.h"
+#include "wx/osx/classic/dcclient.h"
 #else
-#include "wx/mac/carbon/dcclient.h"
+#include "wx/osx/carbon/dcclient.h"
 #endif
--- a/include/wx/osx/dcmemory.h
+++ b/include/wx/osx/dcmemory.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dcmemory.h"
+#include "wx/osx/classic/dcmemory.h"
 #else
-#include "wx/mac/carbon/dcmemory.h"
+#include "wx/osx/carbon/dcmemory.h"
 #endif
--- a/include/wx/osx/dcprint.h
+++ b/include/wx/osx/dcprint.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dcprint.h"
+#include "wx/osx/classic/dcprint.h"
 #else
-#include "wx/mac/carbon/dcprint.h"
+#include "wx/osx/carbon/dcprint.h"
 #endif
--- a/include/wx/osx/dcscreen.h
+++ b/include/wx/osx/dcscreen.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dcscreen.h"
+#include "wx/osx/classic/dcscreen.h"
 #else
-#include "wx/mac/carbon/dcscreen.h"
+#include "wx/osx/carbon/dcscreen.h"
 #endif
--- a/include/wx/osx/dialog.h
+++ b/include/wx/osx/dialog.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dialog.h"
+#include "wx/osx/classic/dialog.h"
 #else
-#include "wx/mac/carbon/dialog.h"
+#include "wx/osx/carbon/dialog.h"
 #endif
--- a/include/wx/osx/dirdlg.h
+++ b/include/wx/osx/dirdlg.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dirdlg.h"
+#include "wx/osx/classic/dirdlg.h"
 #else
-#include "wx/mac/carbon/dirdlg.h"
+#include "wx/osx/carbon/dirdlg.h"
 #endif
--- a/include/wx/osx/dnd.h
+++ b/include/wx/osx/dnd.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dnd.h"
+#include "wx/osx/classic/dnd.h"
 #else
-#include "wx/mac/carbon/dnd.h"
+#include "wx/osx/carbon/dnd.h"
 #endif
--- a/include/wx/osx/evtloop.h
+++ b/include/wx/osx/evtloop.h
@@ -13,6 +13,6 @@
 #ifdef __WXMAC_CLASSIC__
    #error "wxEventLoop is not implemented for Classic build."
 #else
-    #include "wx/mac/carbon/evtloop.h"
+    #include "wx/osx/carbon/evtloop.h"
 #endif

--- a/include/wx/osx/filedlg.h
+++ b/include/wx/osx/filedlg.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/filedlg.h"
+#include "wx/osx/classic/filedlg.h"
 #else
-#include "wx/mac/carbon/filedlg.h"
+#include "wx/osx/carbon/filedlg.h"
 #endif
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/font.h"
+#include "wx/osx/classic/font.h"
 #else
-#include "wx/mac/carbon/font.h"
+#include "wx/osx/carbon/font.h"
 #endif
--- a/include/wx/osx/fontdlg.h
+++ b/include/wx/osx/fontdlg.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/fontdlg.h"
+#include "wx/osx/classic/fontdlg.h"
 #else
-#include "wx/mac/carbon/fontdlg.h"
+#include "wx/osx/carbon/fontdlg.h"
 #endif
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/frame.h"
+#include "wx/osx/classic/frame.h"
 #else
-#include "wx/mac/carbon/frame.h"
+#include "wx/osx/carbon/frame.h"
 #endif
--- a/include/wx/osx/gauge.h
+++ b/include/wx/osx/gauge.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/gauge.h"
+#include "wx/osx/classic/gauge.h"
 #else
-#include "wx/mac/carbon/gauge.h"
+#include "wx/osx/carbon/gauge.h"
 #endif
--- a/include/wx/osx/glcanvas.h
+++ b/include/wx/osx/glcanvas.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/glcanvas.h"
+#include "wx/osx/classic/glcanvas.h"
 #else
-#include "wx/mac/carbon/glcanvas.h"
+#include "wx/osx/carbon/glcanvas.h"
 #endif
--- a/include/wx/osx/helpxxxx.h
+++ b/include/wx/osx/helpxxxx.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/helpxxxx.h"
+#include "wx/osx/classic/helpxxxx.h"
 #else
-#include "wx/mac/carbon/helpxxxx.h"
+#include "wx/osx/carbon/helpxxxx.h"
 #endif
--- a/include/wx/osx/icon.h
+++ b/include/wx/osx/icon.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/icon.h"
+#include "wx/osx/classic/icon.h"
 #else
-#include "wx/mac/carbon/icon.h"
+#include "wx/osx/carbon/icon.h"
 #endif
--- a/include/wx/osx/imaglist.h
+++ b/include/wx/osx/imaglist.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/imaglist.h"
+#include "wx/osx/classic/imaglist.h"
 #else
-#include "wx/mac/carbon/imaglist.h"
+#include "wx/osx/carbon/imaglist.h"
 #endif
--- a/include/wx/osx/joystick.h
+++ b/include/wx/osx/joystick.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/joystick.h"
+#include "wx/osx/classic/joystick.h"
 #else
-#include "wx/mac/carbon/joystick.h"
+#include "wx/osx/carbon/joystick.h"
 #endif
--- a/include/wx/osx/listbox.h
+++ b/include/wx/osx/listbox.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/listbox.h"
+#include "wx/osx/classic/listbox.h"
 #else
-#include "wx/mac/carbon/listbox.h"
+#include "wx/osx/carbon/listbox.h"
 #endif
--- a/include/wx/osx/listctrl.h
+++ b/include/wx/osx/listctrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/listctrl.h"
+#include "wx/osx/classic/listctrl.h"
 #else
-#include "wx/mac/carbon/listctrl.h"
+#include "wx/osx/carbon/listctrl.h"
 #endif
--- a/include/wx/osx/mdi.h
+++ b/include/wx/osx/mdi.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/mdi.h"
+#include "wx/osx/classic/mdi.h"
 #else
-#include "wx/mac/carbon/mdi.h"
+#include "wx/osx/carbon/mdi.h"
 #endif
--- a/include/wx/osx/menu.h
+++ b/include/wx/osx/menu.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/menu.h"
+#include "wx/osx/classic/menu.h"
 #else
-#include "wx/mac/carbon/menu.h"
+#include "wx/osx/carbon/menu.h"
 #endif
--- a/include/wx/osx/menuitem.h
+++ b/include/wx/osx/menuitem.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/menuitem.h"
+#include "wx/osx/classic/menuitem.h"
 #else
-#include "wx/mac/carbon/menuitem.h"
+#include "wx/osx/carbon/menuitem.h"
 #endif
--- a/include/wx/osx/metafile.h
+++ b/include/wx/osx/metafile.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/metafile.h"
+#include "wx/osx/classic/metafile.h"
 #else
-#include "wx/mac/carbon/metafile.h"
+#include "wx/osx/carbon/metafile.h"
 #endif
--- a/include/wx/osx/mimetype.h
+++ b/include/wx/osx/mimetype.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/mimetype.h"
+#include "wx/osx/classic/mimetype.h"
 #else
-#include "wx/mac/carbon/mimetype.h"
+#include "wx/osx/carbon/mimetype.h"
 #endif
--- a/include/wx/osx/minifram.h
+++ b/include/wx/osx/minifram.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/minifram.h"
+#include "wx/osx/classic/minifram.h"
 #else
-#include "wx/mac/carbon/minifram.h"
+#include "wx/osx/carbon/minifram.h"
 #endif
--- a/include/wx/osx/msgdlg.h
+++ b/include/wx/osx/msgdlg.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/msgdlg.h"
+#include "wx/osx/classic/msgdlg.h"
 #else
-#include "wx/mac/carbon/msgdlg.h"
+#include "wx/osx/carbon/msgdlg.h"
 #endif
--- a/include/wx/osx/nonownedwnd.h
+++ b/include/wx/osx/nonownedwnd.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
 #error "no implementation"
 #else
-#include "wx/mac/carbon/nonownedwnd.h"
+#include "wx/osx/carbon/nonownedwnd.h"
 #endif
--- a/include/wx/osx/notebook.h
+++ b/include/wx/osx/notebook.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/notebook.h"
+#include "wx/osx/classic/notebook.h"
 #else
-#include "wx/mac/carbon/notebook.h"
+#include "wx/osx/carbon/notebook.h"
 #endif
--- a/include/wx/osx/palette.h
+++ b/include/wx/osx/palette.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/palette.h"
+#include "wx/osx/classic/palette.h"
 #else
-#include "wx/mac/carbon/palette.h"
+#include "wx/osx/carbon/palette.h"
 #endif
--- a/include/wx/osx/pen.h
+++ b/include/wx/osx/pen.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/pen.h"
+#include "wx/osx/classic/pen.h"
 #else
-#include "wx/mac/carbon/pen.h"
+#include "wx/osx/carbon/pen.h"
 #endif
--- a/include/wx/osx/pnghand.h
+++ b/include/wx/osx/pnghand.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/pnghand.h"
+#include "wx/osx/classic/pnghand.h"
 #else
-#include "wx/mac/carbon/pnghand.h"
+#include "wx/osx/carbon/pnghand.h"
 #endif
--- a/include/wx/osx/pngread.h
+++ b/include/wx/osx/pngread.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/pngread.h"
+#include "wx/osx/classic/pngread.h"
 #else
-#include "wx/mac/carbon/pngread.h"
+#include "wx/osx/carbon/pngread.h"
 #endif
--- a/include/wx/osx/popupwin.h
+++ b/include/wx/osx/popupwin.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
 #error "wxPopupWindow is not supported under this platform."
 #else
-#include "wx/mac/carbon/popupwin.h"
+#include "wx/osx/carbon/popupwin.h"
 #endif
--- a/include/wx/osx/printdlg.h
+++ b/include/wx/osx/printdlg.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/printdlg.h"
+#include "wx/osx/classic/printdlg.h"
 #else
-#include "wx/mac/carbon/printdlg.h"
+#include "wx/osx/carbon/printdlg.h"
 #endif
--- a/include/wx/osx/printmac.h
+++ b/include/wx/osx/printmac.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/printmac.h"
+#include "wx/osx/classic/printmac.h"
 #else
-#include "wx/mac/carbon/printmac.h"
+#include "wx/osx/carbon/printmac.h"
 #endif
--- a/include/wx/osx/private.h
+++ b/include/wx/osx/private.h
@@ -1,7 +1,7 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/private.h"
+#include "wx/osx/classic/private.h"
 #elif defined(__WXOSX_IPHONE__)
-#include "wx/mac/corefoundation/private.h"
+#include "wx/osx/core/private.h"
 #else
-#include "wx/mac/carbon/private.h"
+#include "wx/osx/carbon/private.h"
 #endif
--- a/include/wx/osx/private/print.h
+++ b/include/wx/osx/private/print.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/private/print.h"
+#include "wx/osx/classic/private/print.h"
 #else
-#include "wx/mac/carbon/private/print.h"
+#include "wx/osx/carbon/private/print.h"
 #endif
--- a/include/wx/osx/private/timer.h
+++ b/include/wx/osx/private/timer.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/private/timer.h"
+#include "wx/osx/classic/private/timer.h"
 #else
-#include "wx/mac/carbon/private/timer.h"
+#include "wx/osx/carbon/private/timer.h"
 #endif
--- a/include/wx/osx/radiobox.h
+++ b/include/wx/osx/radiobox.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/radiobox.h"
+#include "wx/osx/classic/radiobox.h"
 #else
-#include "wx/mac/carbon/radiobox.h"
+#include "wx/osx/carbon/radiobox.h"
 #endif
--- a/include/wx/osx/radiobut.h
+++ b/include/wx/osx/radiobut.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/radiobut.h"
+#include "wx/osx/classic/radiobut.h"
 #else
-#include "wx/mac/carbon/radiobut.h"
+#include "wx/osx/carbon/radiobut.h"
 #endif
--- a/include/wx/osx/region.h
+++ b/include/wx/osx/region.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/region.h"
+#include "wx/osx/classic/region.h"
 #else
-#include "wx/mac/carbon/region.h"
+#include "wx/osx/carbon/region.h"
 #endif
--- a/include/wx/osx/scrolbar.h
+++ b/include/wx/osx/scrolbar.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/scrolbar.h"
+#include "wx/osx/classic/scrolbar.h"
 #else
-#include "wx/mac/carbon/scrolbar.h"
+#include "wx/osx/carbon/scrolbar.h"
 #endif
--- a/include/wx/osx/slider.h
+++ b/include/wx/osx/slider.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/slider.h"
+#include "wx/osx/classic/slider.h"
 #else
-#include "wx/mac/carbon/slider.h"
+#include "wx/osx/carbon/slider.h"
 #endif
--- a/include/wx/osx/sound.h
+++ b/include/wx/osx/sound.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/sound.h"
+#include "wx/osx/classic/sound.h"
 #else
-#include "wx/mac/carbon/sound.h"
+#include "wx/osx/carbon/sound.h"
 #endif
--- a/include/wx/osx/spinbutt.h
+++ b/include/wx/osx/spinbutt.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/spinbutt.h"
+#include "wx/osx/classic/spinbutt.h"
 #else
-#include "wx/mac/carbon/spinbutt.h"
+#include "wx/osx/carbon/spinbutt.h"
 #endif
--- a/include/wx/osx/spinctrl.h
+++ b/include/wx/osx/spinctrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/spinctrl.h"
+#include "wx/osx/classic/spinctrl.h"
 #else
-#include "wx/mac/carbon/spinctrl.h"
+#include "wx/osx/carbon/spinctrl.h"
 #endif
--- a/include/wx/osx/srchctrl.h
+++ b/include/wx/osx/srchctrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
 #include "wx/generic/srchctlg.h"
 #else
-#include "wx/mac/carbon/srchctrl.h"
+#include "wx/osx/carbon/srchctrl.h"
 #endif
--- a/include/wx/osx/statbmp.h
+++ b/include/wx/osx/statbmp.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/statbmp.h"
+#include "wx/osx/classic/statbmp.h"
 #else
-#include "wx/mac/carbon/statbmp.h"
+#include "wx/osx/carbon/statbmp.h"
 #endif
--- a/include/wx/osx/statbox.h
+++ b/include/wx/osx/statbox.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/statbox.h"
+#include "wx/osx/classic/statbox.h"
 #else
-#include "wx/mac/carbon/statbox.h"
+#include "wx/osx/carbon/statbox.h"
 #endif
--- a/include/wx/osx/statline.h
+++ b/include/wx/osx/statline.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/statline.h"
+#include "wx/osx/classic/statline.h"
 #else
-#include "wx/mac/carbon/statline.h"
+#include "wx/osx/carbon/statline.h"
 #endif
--- a/include/wx/osx/stattext.h
+++ b/include/wx/osx/stattext.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/stattext.h"
+#include "wx/osx/classic/stattext.h"
 #else
-#include "wx/mac/carbon/stattext.h"
+#include "wx/osx/carbon/stattext.h"
 #endif
--- a/include/wx/osx/statusbr.h
+++ b/include/wx/osx/statusbr.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/statusbr.h"
+#include "wx/osx/classic/statusbr.h"
 #else
-#include "wx/mac/carbon/statusbr.h"
+#include "wx/osx/carbon/statusbr.h"
 #endif
--- a/include/wx/osx/tabctrl.h
+++ b/include/wx/osx/tabctrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/tabctrl.h"
+#include "wx/osx/classic/tabctrl.h"
 #else
-#include "wx/mac/carbon/tabctrl.h"
+#include "wx/osx/carbon/tabctrl.h"
 #endif
--- a/include/wx/osx/taskbarosx.h
+++ b/include/wx/osx/taskbarosx.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/taskbarosx.h"
+#include "wx/osx/classic/taskbarosx.h"
 #else
-#include "wx/mac/carbon/taskbarosx.h"
+#include "wx/osx/carbon/taskbarosx.h"
 #endif
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/textctrl.h"
+#include "wx/osx/classic/textctrl.h"
 #else
-#include "wx/mac/carbon/textctrl.h"
+#include "wx/osx/carbon/textctrl.h"
 #endif
--- a/include/wx/osx/tglbtn.h
+++ b/include/wx/osx/tglbtn.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/tglbtn.h"
+#include "wx/osx/classic/tglbtn.h"
 #else
-#include "wx/mac/carbon/tglbtn.h"
+#include "wx/osx/carbon/tglbtn.h"
 #endif
--- a/include/wx/osx/toolbar.h
+++ b/include/wx/osx/toolbar.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/toolbar.h"
+#include "wx/osx/classic/toolbar.h"
 #else
-#include "wx/mac/carbon/toolbar.h"
+#include "wx/osx/carbon/toolbar.h"
 #endif
--- a/include/wx/osx/tooltip.h
+++ b/include/wx/osx/tooltip.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/tooltip.h"
+#include "wx/osx/classic/tooltip.h"
 #else
-#include "wx/mac/carbon/tooltip.h"
+#include "wx/osx/carbon/tooltip.h"
 #endif
--- a/include/wx/osx/toplevel.h
+++ b/include/wx/osx/toplevel.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/toplevel.h"
+#include "wx/osx/classic/toplevel.h"
 #else
-#include "wx/mac/carbon/toplevel.h"
+#include "wx/osx/carbon/toplevel.h"
 #endif
--- a/include/wx/osx/treectrl.h
+++ b/include/wx/osx/treectrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/treectl.h"
+#include "wx/osx/classic/treectl.h"
 #else
-#include "wx/mac/carbon/treectrl.h"
+#include "wx/osx/carbon/treectrl.h"
 #endif
--- a/include/wx/osx/uma.h
+++ b/include/wx/osx/uma.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/uma.h"
+#include "wx/osx/classic/uma.h"
 #else
-#include "wx/mac/carbon/uma.h"
+#include "wx/osx/carbon/uma.h"
 #endif
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/window.h"
+#include "wx/osx/classic/window.h"
 #else
-#include "wx/mac/carbon/window.h"
+#include "wx/osx/carbon/window.h"
 #endif