fixing file paths after renaming

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

diff --git a/include/wx/accel.h b/include/wx/accel.h
index fe1ec1a6fa71dc399014dde1e34907e5d6e097d1..0d3593cc282a2463db621a254970849a4359cad5 100644 (file)
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -157,7 +157,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/accel.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/accel.h"
+    #include "wx/osx/accel.h"
 #elif defined(__WXCOCOA__)
     #include "wx/generic/accel.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/app.h b/include/wx/app.h
index 553a29aa5c2cb2b98ad429f4a57811b5c04b4545..5f4d622bae14cf5c74ec389c9730fbbba7e69a4c 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -596,7 +596,7 @@ protected:
 #elif defined(__WXX11__)
     #include "wx/x11/app.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/app.h"
+    #include "wx/osx/app.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/app.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 42f48524f95cbb316b9a01bd257986c3dec110da..37419c7e80aee6120cd77e45e16f469678a03c11 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -243,7 +243,7 @@ protected:
 #elif defined(__WXDFB__)
     #include "wx/dfb/bitmap.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/bitmap.h"
+    #include "wx/osx/bitmap.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/bitmap.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 21412bf42581833353a0ccc5e4c3e1be015270b6..4ebb839dfdd4c70d320b7b45f967cded35eb668d 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -110,7 +110,7 @@ inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap)
 #elif defined(__WXGTK__)
     #include "wx/gtk1/bmpbuttn.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/bmpbuttn.h"
+    #include "wx/osx/bmpbuttn.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/bmpbuttn.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/brush.h b/include/wx/brush.h
index acddcd314c8a2c88d171f4c6aa68720f9bdf9d62..fa0103cf4d6322be21682843d0bd61e5db5ede3c 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -77,7 +77,7 @@ public:
 #elif defined(__WXDFB__)
     #include "wx/dfb/brush.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/brush.h"
+    #include "wx/osx/brush.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/brush.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/button.h b/include/wx/button.h
index 250f53129cea5428c096af388fab2303b8467eac..519d0b7ffefd0cfadffbedf4c08fb4be038132b0 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -95,7 +95,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/button.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/button.h"
+    #include "wx/osx/button.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/button.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 96e7c8679dc6cee409fd5c30cd27136fa3f4bca7..e471358b21d0c8f8a7db90695bf6c7cb8c63fee3 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -144,7 +144,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/checkbox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/checkbox.h"
+    #include "wx/osx/checkbox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index 1d886ba4b081c9d0883952396dc0b79130cccb13..f7ec1a8762e8dacbe39cbfc0554849b66842e441 100644 (file)
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@@ -51,7 +51,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/checklst.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/checklst.h"
+    #include "wx/osx/checklst.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checklst.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 9fb5dbbf083f82313afe9a94d5564420d68f5ba5..36095513db17d5cd3df48ef1384e32fc6813f5e5 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1023,7 +1023,7 @@
 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"
 #elif defined(__WXMAC__)
-#  include "wx/mac/chkconf.h"
+#  include "wx/osx/chkconf.h"
 #elif defined(__OS2__)
 #  include "wx/os2/chkconf.h"
 #elif defined(__WXMGL__)

diff --git a/include/wx/choice.h b/include/wx/choice.h
index e6e85a22413b10c6391011cb037e9771824a9507..18d31d2c12c59926b6b0342e582f3adf3f04ddf8 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -79,7 +79,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/choice.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/choice.h"
+    #include "wx/osx/choice.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/choice.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 9977256a31d4407a435cf59080c6b90c5ba0dcd0..738343ac4da772844499de8f46d0bf67da9af646 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -118,7 +118,7 @@ public:
 #elif defined(__WXMGL__)
     #include "wx/mgl/clipbrd.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/clipbrd.h"
+    #include "wx/osx/clipbrd.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/clipbrd.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/cocoa/ObjcRef.h b/include/wx/cocoa/ObjcRef.h
index ccb3d3156f685f77fddb5c61fecaf2783f0ef3eb..f08c6435ddb62f86dd8470a2ac9eb8f94d8e6d1f 100644 (file)
--- a/include/wx/cocoa/ObjcRef.h
+++ b/include/wx/cocoa/ObjcRef.h
@@ -13,7 +13,7 @@
 #define _WX_COCOA_OBJCREF_H__
 
 // Reuse wxCFRef-related code (e.g. wxCFRetain/wxCFRelease)
-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"
 
 // NOTE WELL: We can only know whether or not GC can be used when compiling Objective-C.
 // Therefore we cannot implement these functions except when compiling Objective-C.

diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index 36c8e57805415c7de47bf51334636b7ea82657c6..bed4a07c7f3873066e78485da99400282e2800f4 100644 (file)
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -15,7 +15,7 @@
 typedef struct __CFRunLoopObserver * CFRunLoopObserverRef;
 typedef const struct __CFString * CFStringRef;
 
-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"
 
 // ========================================================================
 // wxApp

diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index ddec620a9f26f722fb990d220b2ece28c895bc7d..3209d94f0c55224db144d640a13f7d16477bf8c8 100644 (file)
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -38,6 +38,7 @@ public:
     // accessors
     virtual bool IsOk() const { return m_cocoaNSColor; }
     WX_NSColor GetNSColor() { return m_cocoaNSColor; }
+    WX_NSColor GetNSColor() const { return m_cocoaNSColor; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index d0aac1af88f7fa31bd580967e1e99687583c208c..7c36c2b1a71128ec8d74b32d3e3521d6670afb08 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -19,7 +19,7 @@
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/colordlg.h"
 #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
-    #include "wx/mac/colordlg.h"
+    #include "wx/osx/colordlg.h"
 #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/colordlg.h"
 #elif defined(__WXPALMOS__)

diff --git a/include/wx/colour.h b/include/wx/colour.h
index 9c2fc423b758077f6242ca5ba599fb6ce42af769..68f68457879c6f2d37c31eb12ae807bea6e6ca1c 100644 (file)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -189,7 +189,7 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
 #elif defined(__WXX11__)
     #include "wx/x11/colour.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/colour.h"
+    #include "wx/osx/colour.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/colour.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index ce7ba61aeebc1a093706212e5138f7de6e904b34..58d5344e22ad9d3fab8e1345858b7c46c39c90ab 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -68,7 +68,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/combobox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/combobox.h"
+    #include "wx/osx/combobox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/combobox.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/control.h b/include/wx/control.h
index 2a91838078d0f681ad3e5dcbdc26044d7e6f1e94..ecc897525c9aba608a02f2cc33697ec727298934 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -131,7 +131,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/control.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/control.h"
+    #include "wx/osx/control.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/control.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index f77ecc2a4e69e112ae1900c8d876ece9229e3233..893f9fe5758d85ba9e6f2144aa612a5642d4699a 100644 (file)
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -31,7 +31,7 @@
 #elif defined(__WXDFB__)
     #include "wx/dfb/cursor.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/cursor.h"
+    #include "wx/osx/cursor.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/cursor.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index f7923c0b6519cc1d2829b457beb3b7208d386927..8966541e4e971252bae3b54f822735244abb588b 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -83,7 +83,7 @@ public:
 #elif defined(__WXX11__)
     #include "wx/x11/dataform.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/dataform.h"
+    #include "wx/osx/dataform.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dataform.h"
 #elif defined(__WXPM__)
@@ -171,7 +171,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/dataobj.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/dataobj.h"
+    #include "wx/osx/dataobj.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dataobj.h"
 #elif defined(__WXPM__)
@@ -515,7 +515,7 @@ private:
     #elif defined(__WXMOTIF__)
         #include "wx/motif/dataobj2.h"
     #elif defined(__WXMAC__)
-        #include "wx/mac/dataobj2.h"
+        #include "wx/osx/dataobj2.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/dataobj2.h"
     #elif defined(__WXPM__)

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 39ab01c92fadd93d178a9ffe983bf579b594b20a..6f3d54db185bd66805010f79c7842e50d8f1f92a 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -861,7 +861,7 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 #elif defined(__WXGTK20__)
     #include "wx/gtk/dataview.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/dataview.h"
+    #include "wx/osx/dataview.h"
 #else
     #include "wx/generic/dataview.h"
 #endif

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 9eee12da29ea6843403c2b8e230a3b008e6e49a5..a8160033fdb05974209692ee10ef73f5d5d15edb 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -314,7 +314,7 @@ public:
     #elif defined(__WXGTK__)
         #include "wx/gtk1/dialog.h"
     #elif defined(__WXMAC__)
-        #include "wx/mac/dialog.h"
+        #include "wx/osx/dialog.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/dialog.h"
     #elif defined(__WXPM__)

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index b7f0b8e890d7afbecab1d132f58c2f06c81a6c02..fc86e195279895440271ccde224a4ef097729b4f 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -111,7 +111,7 @@ protected:
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
 #elif defined(__WXMAC__)
-    #include "wx/mac/dirdlg.h"      // Native Mac
+    #include "wx/osx/dirdlg.h"      // Native Mac
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dirdlg.h"    // Native Cocoa
 #elif defined(__WXMOTIF__) || \

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 43c418f6ce10f556f453f90fc6980aa7434b98b6..d1cde3e9cd61ba90af3f3c1a77f1d6d11d72644e 100644 (file)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -222,7 +222,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/dnd.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/dnd.h"
+    #include "wx/osx/dnd.h"
 #elif defined(__WXPM__)
     #include "wx/os2/dnd.h"
 #endif

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 5528d8be312b73ec9d286552add7499fb10152ae..0be2ab6dc79feef34770063954e638c6e6c7fd7b 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -116,7 +116,7 @@ protected:
 #elif defined(__WXMSW__)
     #include "wx/msw/evtloop.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/evtloop.h"
+    #include "wx/osx/evtloop.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/evtloop.h"
 #else // other platform

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index e939c82d5e1c4f17e9caa263e1a08d383551a93f..1f9b24715a39efa882429906c49a7862001afe64 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -218,7 +218,7 @@ wxSaveFileSelector(const wxString& what,
 #elif defined(__WXGTK__)
     #include "wx/gtk1/filedlg.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/filedlg.h"
+    #include "wx/osx/filedlg.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/filedlg.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/font.h b/include/wx/font.h
index c97ea06194ee35cef6b1d493f97c165a48811042..e1bb6540933447e50d2cb9dffac164aa62fbc171 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -243,7 +243,7 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
 #elif defined(__WXDFB__)
     #include "wx/dfb/font.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/font.h"
+    #include "wx/osx/font.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/font.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 8a908237263494bf6ea0883f6af5c54052b6f5f7..2d845d5e3ab58e78c6605d34e33461c182043916 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -99,7 +99,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/fontdlg.h"
+    #include "wx/osx/fontdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/frame.h b/include/wx/frame.h
index a84dbcd302e92fa271d1b066a385022ec605c0aa..fe718971b755ce82514617f8c3eae60d5f917d57 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -263,7 +263,7 @@ protected:
     #elif defined(__WXMOTIF__)
         #include "wx/motif/frame.h"
     #elif defined(__WXMAC__)
-        #include "wx/mac/frame.h"
+        #include "wx/osx/frame.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/frame.h"
     #elif defined(__WXPM__)

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index bfb9f70eb215ae6f8440d5989609c2d52fe977cb..1e2bd61ca86a2a3a77eea9c2e2fa31c5bab227f9 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -114,7 +114,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/gauge.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/gauge.h"
+    #include "wx/osx/gauge.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/gauge.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 1d02f86652e58d9b495cb8ee278bddbbd74ec695..4722a99a9483ae9b6b3effd7288e4b719c576865 100644 (file)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -191,7 +191,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/glcanvas.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/glcanvas.h"
+    #include "wx/osx/glcanvas.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/glcanvas.h"
 #else

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 6696e9d2ceffc53694c4b2591cb13fecd292557b..7d5b946ca59b1d480f70f17bf3a6a8b3db6a2bec 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -32,7 +32,7 @@
 #elif defined(__WXDFB__)
   #include "wx/generic/icon.h"
 #elif defined(__WXMAC__)
-  #include "wx/mac/icon.h"
+  #include "wx/osx/icon.h"
 #elif defined(__WXCOCOA__)
   #include "wx/cocoa/icon.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 2779e3f1e598daa23351c68219cff19989677915..8832ab7668187587eb724ab1ef171d79528bdddd 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -49,7 +49,7 @@ enum
 #elif defined(__WXMSW__)
     #include "wx/msw/imaglist.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/imaglist.h"
+    #include "wx/osx/imaglist.h"
 #elif defined(__WXPALMOS__)
     #include "wx/palmos/imaglist.h"
 #endif

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 1fe2e6d55e80c9d050c4b55f9338b3fb75884925..d29ba50b25b2233e53ad5968035f6f2be4999dc0 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -25,9 +25,9 @@
 #elif defined(__WXX11__)
 #include "wx/unix/joystick.h"
 #elif defined(__DARWIN__)
-#include "wx/mac/corefoundation/joystick.h"
+#include "wx/osx/core/joystick.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/joystick.h"
+#include "wx/osx/joystick.h"
 #elif defined(__WXPM__)
 #include "wx/os2/joystick.h"
 #endif

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index b009bf35757214e1820d4c260bfcb7af382cff3d..50d409c1898069e75d6076c0cf45894c6d2c0ce5 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -127,7 +127,7 @@ private:
 #elif defined(__WXGTK__)
   #include "wx/gtk1/listbox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/listbox.h"
+    #include "wx/osx/listbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/listbox.h"
 #elif defined(__WXCOCOA__)

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 8bb9adcabce0da3bd531f06489bfc521a15c2788..19c9cd13831e1d7531a2462ba0d39482e09f5746 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -31,7 +31,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
 #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
-    #include "wx/mac/carbon/listctrl.h"
+    #include "wx/osx/carbon/listctrl.h"
 #else
     #include "wx/generic/listctrl.h"
 #endif

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 29c861e1014f5961d35c3cbf991f8610a4e2b259..0c12f3d871708d70a81314b4bd05a251d9d360c8 100644 (file)
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -27,7 +27,7 @@
 #elif defined(__WXGTK__)
     #include "wx/gtk1/mdi.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/mdi.h"
+    #include "wx/osx/mdi.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/mdi.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/menu.h b/include/wx/menu.h
index 8cae2e12557e263a25e76c9ac3af98785ed3deab..c3d000a50bbe3232c61c074a1455f864fe751d87 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -532,7 +532,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/menu.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/menu.h"
+    #include "wx/osx/menu.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menu.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 1da5f652115f9819a9819ea0dfdb0826409dffe9..1f98a5d1ee65fdc4b2d4dfd07f28d40ac380f330 100644 (file)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -200,7 +200,7 @@ inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text);
 #elif defined(__WXGTK__)
     #include "wx/gtk1/menuitem.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/menuitem.h"
+    #include "wx/osx/menuitem.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menuitem.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 5005c42c3a161030e58aa4d409599eddd3c0fa4e..4d226c272cc58902d6a62b00fa1ceb71bb864371 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -54,7 +54,7 @@
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/metafile.h"
+    #include "wx/osx/metafile.h"
 #endif
 
 #endif // wxUSE_METAFILE

diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 6c8fd679f1d28877ca080b0ad81a9a1ae80f1afb..3dfe5814299da50986f4afbe995ebbaf47dc4122 100644 (file)
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -29,7 +29,7 @@
 #elif defined(__WXX11__)
 #include "wx/x11/minifram.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/minifram.h"
+#include "wx/osx/minifram.h"
 #elif defined(__WXPM__)
 #include "wx/os2/minifram.h"
 #else

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index b2701d28f76e0f0ae5152c40b103b42af6e2e9a4..3a0174e8fb4e71fca750f78046be8eba90c2915f 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -126,7 +126,7 @@ protected:
 #elif defined(__WXGTK20__)
     #include "wx/gtk/msgdlg.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/msgdlg.h"
+    #include "wx/osx/msgdlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/msgdlg.h"
 #endif

diff --git a/include/wx/nonownedwnd.h b/include/wx/nonownedwnd.h
index f89c6048ee8ed40e9af7214965a63c78297949cd..45cb0bea410f5a17dc2b7261ebf6f2d94935f3a7 100644 (file)
--- a/include/wx/nonownedwnd.h
+++ b/include/wx/nonownedwnd.h
@@ -15,7 +15,7 @@
 #if defined(__WXDFB__)
     #include "wx/dfb/nonownedwnd.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/nonownedwnd.h"
+    #include "wx/osx/nonownedwnd.h"
 #else
     // other ports can derive both wxTLW and wxPopupWindow directly
     // from wxWindow:

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 3522f9f3e256ffcb22370429f6cd86d95528bdae..5350a11b2692c251bea758f1aa5124dbfbd9d2ab 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -167,7 +167,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 #elif defined(__WXGTK__)
     #include  "wx/gtk1/notebook.h"
 #elif defined(__WXMAC__)
-    #include  "wx/mac/notebook.h"
+    #include  "wx/osx/notebook.h"
 #elif defined(__WXCOCOA__)
     #include  "wx/cocoa/notebook.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/osx/accel.h b/include/wx/osx/accel.h
index dcccf61a60d1cfd6ba8b6f6ab38bfdf3b23eb86d..85996dc7a014a9c9f12360b1285ed76c2ab082c4 100644 (file)
--- 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

diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
index 9c011306b938011b05b8e816802abab9b3d07b93..127c195927f219aafa3b5c2fcf8451323086a0df 100644 (file)
--- 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

diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index 297b4b51d5abf1d4a237aede9bfdbb1280e69bcc..8f27f201281d11a2ee0daa0b6c9b7fd57d2713be 100644 (file)
--- 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

diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index 216f13de50511101201b9e7a62c8ab6219506a0c..50a7fca286c86128c61f44ea2e6ca182eee3a35e 100644 (file)
--- 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

diff --git a/include/wx/osx/brush.h b/include/wx/osx/brush.h
index e910b1fac7d3cf09c708e7731ece0d60ad4a7c26..cfc6b6afba5ccad10dc546b69f82d8e0d23d9874 100644 (file)
--- 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

diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index c6b02cfc9178143fc249481856482a55331c69a2..0fcd3e030bf597b8ce59c1a94fb392f9819f50b5 100644 (file)
--- 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

diff --git a/include/wx/osx/carbon/clipbrd.h b/include/wx/osx/carbon/clipbrd.h
index 973530ad296bf47c803b5b2edc712e94165e34df..db74c5ba46ec8cd5b368350c1709d2e09ef4ad4f 100644 (file)
--- 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

diff --git a/include/wx/osx/carbon/colour.h b/include/wx/osx/carbon/colour.h
index 9b1d6129d579f27803e08c9a673c5f1d5cce1aab..1406e609df5f90e5633f672fafd0cb821b10d893 100644 (file)
--- 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;
 

diff --git a/include/wx/osx/carbon/databrow.h b/include/wx/osx/carbon/databrow.h
index 487388b4df9a27100b405b071a33c80f155fdca6..6da631570e8f4214ae883ffff2eb29f416da6df4 100644 (file)
--- 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);
 

diff --git a/include/wx/osx/carbon/dcmemory.h b/include/wx/osx/carbon/dcmemory.h
index c42c6544e7e11f8eef7df2d1dafbfe5f0747b896..7c69b01f79caef1a6cf501fa4e7a0f8c75de9bff 100644 (file)
--- 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
 {

diff --git a/include/wx/osx/carbon/dcscreen.h b/include/wx/osx/carbon/dcscreen.h
index a97d66554e917c3f52c8aabfbfb6c36486bb4ab8..76f1f54176ec1a9309fdab99e42e096ab2c2d1c2 100644 (file)
--- 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
 {

diff --git a/include/wx/osx/carbon/metafile.h b/include/wx/osx/carbon/metafile.h
index da4c8641500415b9ed8ce390fc69b7cab7a332b7..4421a565bf56d8939e1ebd907b46a1e7139471f0 100644 (file)
--- 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

diff --git a/include/wx/osx/carbon/private.h b/include/wx/osx/carbon/private.h
index 2b9a27e04dcd80ca423f2cac736919fa098e6578..fbbcb3c5cd28e87d6b89bfc0f09044ce5d1c5962 100644 (file)
--- 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
 {

diff --git a/include/wx/osx/carbon/private/mactext.h b/include/wx/osx/carbon/private/mactext.h
index 2ef0cbcaed7f19bed129af40cfd5b37c83aa42a5..72c7f9d2e6bbc6261d2d4ca598bf04c949489f00 100644 (file)
--- 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

diff --git a/include/wx/osx/carbon/private/overlay.h b/include/wx/osx/carbon/private/overlay.h
index 002da9a3386bb1a43f085bbd2327139fe49632c9..b3b7608b03981b4146e4d87a7ab1da24c50a1853 100644 (file)
--- 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"
 

diff --git a/include/wx/osx/carbon/uma.h b/include/wx/osx/carbon/uma.h
index 78a34d3fa318adb6d63feb02875f319d18f4a660..2dbb8777c2298a410c1dc5e501e91af909b6787b 100644 (file)
--- 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() ;

diff --git a/include/wx/osx/checkbox.h b/include/wx/osx/checkbox.h
index f7f7bf2de1b3ed27c7c568ca2b6d8da0e02d1867..d578f6da22f33edb39f5e283c5fdad59da105888 100644 (file)
--- 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

diff --git a/include/wx/osx/checklst.h b/include/wx/osx/checklst.h
index 098262d5fec603bf3e1fa7812a19ad4924cc2f3c..81ef6c6d4bc4ab1c47af1690840dde96644b8393 100644 (file)
--- 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

diff --git a/include/wx/osx/chkconf.h b/include/wx/osx/chkconf.h
index 916c1625748da628bdf31b02b22cae35dc430974..94069d247fa5d5957d107b371e08419b49953c93 100644 (file)
--- 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

diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h
index c1dc2abdda3a69133a69de9375b44cf18e081500..011827b7e08ee1ccf84d7f5955798452e6081792 100644 (file)
--- 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

diff --git a/include/wx/osx/clipbrd.h b/include/wx/osx/clipbrd.h
index 5ee122ba68e8f61625887d52215e51a2f72699b3..b16d3418b1b7eb1ef7f5b6f0fc0d9a06db252287 100644 (file)
--- 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

diff --git a/include/wx/osx/colordlg.h b/include/wx/osx/colordlg.h
index c6a3ac644708003a221cfc750f2e1d4a83454569..89f32c2195096d8cd8330efed3db9043f4a5099d 100644 (file)
--- 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
 

diff --git a/include/wx/osx/colour.h b/include/wx/osx/colour.h
index 6f42a76fa08a7fcdba37fd5e17dd3abb47499443..0a0d1c4d57cc959d87726ae0bbf73f3836ab9dd6 100644 (file)
--- 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

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index f4d0125ef40a94aaa9086eb0efbfb6bc86dd0334..8525d8008dceb42fc92eda558aaec86ab82431d3 100644 (file)
--- 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

diff --git a/include/wx/osx/control.h b/include/wx/osx/control.h
index e98814a856e9420755720825ddc0f392f96710c3..73ddfa3b65292687f101b0d5ff874301743a1dd0 100644 (file)
--- 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

diff --git a/include/wx/osx/core/cfdataref.h b/include/wx/osx/core/cfdataref.h
index 19a44d71a835dfbf293056d4aa84e9bb7b8e4596..8a9d7e8c812c134b021a3acea852bde803a1a857 100644 (file)
--- 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>
 

diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h
index c4b1719c4df0ad9dbee5e08c596a2af19b2723bb..523b5f34624a8d15f0275630673e7b534567ebeb 100644 (file)
--- 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;
 

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 9d70b22c7a20137f22403ee560456705a5b0b1c3..ba28408ad21907e97529b2620492e373ec23a4db 100644 (file)
--- 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
 

diff --git a/include/wx/osx/cursor.h b/include/wx/osx/cursor.h
index b0d7d2a260988a0030a35445831eb1ba4a41f189..157d7e20ac467f52689c1619d33e6e9001fa1caf 100644 (file)
--- 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

diff --git a/include/wx/osx/dataform.h b/include/wx/osx/dataform.h
index e4a953d14ab0fdc0d8b4003e9dd2d1d4eea98e05..b0c0bd7ba27539d07855da9221a65fcbac4535bd 100644 (file)
--- 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

diff --git a/include/wx/osx/dataobj.h b/include/wx/osx/dataobj.h
index 463e151b6c7ae308c7b77ed0bfea1476180f8eec..28b137f957391d62e42d3468d7d5061c40aa9fac 100644 (file)
--- 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

diff --git a/include/wx/osx/dataobj2.h b/include/wx/osx/dataobj2.h
index c03578a2ed6e6369121dfe1f071a920571a29291..546577a2111008d4bcedd86e4059caf0a93eabcb 100644 (file)
--- 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

diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h
index ffae4f69eaaeb546d15001a07f0cc951a93a539f..8c7fbf5410b686da10090156260f6d8671d65df8 100644 (file)
--- 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

diff --git a/include/wx/osx/dc.h b/include/wx/osx/dc.h
index ac1e66b22e4f721f479874249b0434ec8226b29f..fd1b3f8f971388d3a8ceebcfbd7bd9cab26656ff 100644 (file)
--- 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

diff --git a/include/wx/osx/dcclient.h b/include/wx/osx/dcclient.h
index 8f824811b2d9d4e6452fb57ec3e2c822193604b0..280167a2cb0f01152a43656a80e32478e908dad4 100644 (file)
--- 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

diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h
index 5ae0e64a2852e3ac8d6e8e7b74554af1794c24b7..2b9003b3c6a528fa6cab4abe24576037b831cc32 100644 (file)
--- 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

diff --git a/include/wx/osx/dcprint.h b/include/wx/osx/dcprint.h
index 74537d6392b06d42e8d72463530244f3dddc05eb..51b22c6c0841924940d708a52e674ad2a354ca8b 100644 (file)
--- 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

diff --git a/include/wx/osx/dcscreen.h b/include/wx/osx/dcscreen.h
index 8e710bed4b974f6b1a0cdb9543e814a4a3746da9..13b7afb7d99ec92f52b092bf3afbae779f4b7334 100644 (file)
--- 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

diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h
index abc6c003ed99c72585915c297184170f6aff5a61..2ab090bbbdcd6f2964276ca7fe6406b763b07492 100644 (file)
--- 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

diff --git a/include/wx/osx/dirdlg.h b/include/wx/osx/dirdlg.h
index 1861746529d2e114a4596e8057bdb4c8c392cac9..689d2adf6238c05f710f836521c89108bf3f64bf 100644 (file)
--- 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

diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h
index 496aa7638358dbc003b87b62d9ca247f54f8f924..7f54a209e757ee2b5385a5a0aee3c60a535ba5c5 100644 (file)
--- 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

diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h
index 86509da3112f1f3de83c2b97d5dda77c43812aa6..19410d62d8c6528f652b0469a40e49f043298d44 100644 (file)
--- 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
 

diff --git a/include/wx/osx/filedlg.h b/include/wx/osx/filedlg.h
index 8ed7194bdf5817b38ebf50269f8e61052d8e65ae..7d9813366c2f2e56b93b067c59c7a9367f96e14d 100644 (file)
--- 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

diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index ae2770d072a37d89a3959010523b2a1eeb6b1b6b..2114906bef4c988f372240a1ac52bb0db6b6a57c 100644 (file)
--- 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

diff --git a/include/wx/osx/fontdlg.h b/include/wx/osx/fontdlg.h
index ab9fba13caa2d8ce8a25eb1d74ea8e3c664e09a3..1c35ddb1d3aefdeb0e786d4ef29c73a0a334f18b 100644 (file)
--- 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

diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index fceb903d245e5aa98adec789c79b12d431c16388..2952bf36dc1bcef6de1b6303f7c80a902555e4e7 100644 (file)
--- 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

diff --git a/include/wx/osx/gauge.h b/include/wx/osx/gauge.h
index cac67868faa79e8f680d9174a9ab495afbd9dc46..568eca5b7584d2958fbe33c567e0770e4f0488ca 100644 (file)
--- 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

diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h
index 3dfff78fa33723fa37d57602d178192c1bb29d7c..3e63b7bf79eb8abb02b9d3b1daeaa71c38342a76 100644 (file)
--- 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
\ No newline at end of file

diff --git a/include/wx/osx/helpxxxx.h b/include/wx/osx/helpxxxx.h
index aaea7f287146c606635670591e4309a0bed6c4a5..5a6a67ff63db4ec0acc4fc8fa89085188e25b57c 100644 (file)
--- 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
\ No newline at end of file

diff --git a/include/wx/osx/icon.h b/include/wx/osx/icon.h
index e2be1b3f1f2667ff32b15619d384a3bedca3231c..8ef62dac14ca85645ddad279d3552683c8204e21 100644 (file)
--- 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

diff --git a/include/wx/osx/imaglist.h b/include/wx/osx/imaglist.h
index 3dd3d032adf6d4df69e40b1164082c18670f69aa..2e645036996745dbe99e3800b89741e45e71639c 100644 (file)
--- 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

diff --git a/include/wx/osx/joystick.h b/include/wx/osx/joystick.h
index 7614c25668ddb4a2558e2f2bf8af992ce6858ac2..969cac9626ef9b2c78899ee204a2a5515fb05e23 100644 (file)
--- 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

diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h
index a51668a18833e26c28fcc764adbf643344513860..078ca2a4ece38457731cd07d82329a06d4c801a7 100644 (file)
--- 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

diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h
index be9ffdfed1aafb20af197f8d2aff11c1f972276d..373d2e57abae1758fdc3c73c6bf9f28458fbb2d3 100644 (file)
--- 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
\ No newline at end of file

diff --git a/include/wx/osx/mdi.h b/include/wx/osx/mdi.h
index d8c57f9acfb73d2c3acd837300fab9926b0736c2..1e0c1fed86f702277232813780d5875ed551382b 100644 (file)
--- 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

diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h
index 70c1e127923a76e231460006f510ecce067e2fa2..ea9cae7133ee1d5617fa7d1b0cb323041b901a97 100644 (file)
--- 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

diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h
index 3c3748cb29d404f27be5841e7e4099186dae9472..5bf0c78974d530a1916471f80d20d1e065b2d32e 100644 (file)
--- 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

diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h
index fe7274d9fbdcb649605b994d3002cdb7deeef123..3b8d5335a2e1f267ba773af7b22afc07ec28ad8a 100644 (file)
--- 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

diff --git a/include/wx/osx/mimetype.h b/include/wx/osx/mimetype.h
index 7195dcc61ccab18ebf23513c4489e183b9305e89..c45adc576bb6db13529d7397bed9574e897c4117 100644 (file)
--- 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

diff --git a/include/wx/osx/minifram.h b/include/wx/osx/minifram.h
index d0035febbaba324be44f7a2c2cb9cd497cf023f8..3b6a719f0a554194b0432f40a09cb256aeeeae24 100644 (file)
--- 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

diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h
index d3c1e31de54a073205dd34af575c86e52e2681e0..2fdecde6961063029a9a85650a1cd51aa5f5d58c 100644 (file)
--- 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

diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index 15c53efc27d8932ccc9bd1f41043db8a18654c2f..126299df5df11d900fdf84e8847a6839af37d7c0 100644 (file)
--- 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
\ No newline at end of file

diff --git a/include/wx/osx/notebook.h b/include/wx/osx/notebook.h
index a47ba1b1719914144339a45a76fce4c5510acb37..12655a9f0c6bf59cff5c20e7aa97c0ca4bb222e3 100644 (file)
--- 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

diff --git a/include/wx/osx/palette.h b/include/wx/osx/palette.h
index 57e1f2ff5e364bc6617f6171ba2051a4c55f5834..8eb1cd199e14e1c488f9f4bf90bb189a6aff56a4 100644 (file)
--- 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

diff --git a/include/wx/osx/pen.h b/include/wx/osx/pen.h
index 3803315a61b2eed751befa19bad75c24d4802159..0307ce4a33793c9f15edc8b816e014c770203bf5 100644 (file)
--- 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

diff --git a/include/wx/osx/pnghand.h b/include/wx/osx/pnghand.h
index bd6e57aab9e968fe63639c9e0decfe818b8916fd..3d02b61176efcd5ec7dffb2998f57ae4584383bc 100644 (file)
--- 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

diff --git a/include/wx/osx/pngread.h b/include/wx/osx/pngread.h
index cbd51857c9423aa53ba13322a4ec8e5291885d64..7481e1d0d229bfd318e90a5cf15a3d5fa3fc7a84 100644 (file)
--- 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

diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h
index e230fccf5f9354970efb958850bf6c47565b41ce..8c7eed39a8c2193475f2417801c060f006eb1523 100644 (file)
--- 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

diff --git a/include/wx/osx/printdlg.h b/include/wx/osx/printdlg.h
index b3ff46f8ca1c7abe0ea0e8581ce84e08ecbcfd82..cbe2742ddab8c8aa69c6300e389ec1d4d5123ea2 100644 (file)
--- 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

diff --git a/include/wx/osx/printmac.h b/include/wx/osx/printmac.h
index b267cd33cfebf60dd080d54b3325d0387f1f9344..32c598a8545100df4c064d5bbfaf790419fcc49b 100644 (file)
--- 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

diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h
index 75cf558a221f9a048b4647010b68ce9c6d0b06d3..ce2ed5c6f803f05ae8c37f98939965dd31816655 100644 (file)
--- 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

diff --git a/include/wx/osx/private/print.h b/include/wx/osx/private/print.h
index 99e4aad109508d7af9af7fc6c2feeaf27c854207..6f33d3ba17f8b6943634b54f92c702d649355983 100644 (file)
--- 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

diff --git a/include/wx/osx/private/timer.h b/include/wx/osx/private/timer.h
index 4532e42f5453d93bfca64520ca13cbe86858783b..024f6d88eead063c87601019afa0af0f1131f84d 100644 (file)
--- 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

diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h
index 752554dff0e5b3c780edb76857b42230f0074965..3378811c575764ca7477ebd5011b7b2d3a254e7c 100644 (file)
--- 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

diff --git a/include/wx/osx/radiobut.h b/include/wx/osx/radiobut.h
index 14ec77d4db3ef0aea4c267a247eccc1975427e77..ff66c40e6541ef87e25df5ca38106a3cf4c1c8da 100644 (file)
--- 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

diff --git a/include/wx/osx/region.h b/include/wx/osx/region.h
index 2bdcd52252183c60afbdc08683821d491a17e0f5..8109c46c54f971c355d5d6db2811e64cbce67501 100644 (file)
--- 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

diff --git a/include/wx/osx/scrolbar.h b/include/wx/osx/scrolbar.h
index 90bf27701e459507a6be4ef77b77190f8825e3dc..135678af820dc18989ea96b03b7fb889f706b458 100644 (file)
--- 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

diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h
index 679c7db5de0a79b710606b879da91179674eb52a..6409c36fefe1f61471bf8a5bac56fc6440554aa7 100644 (file)
--- 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

diff --git a/include/wx/osx/sound.h b/include/wx/osx/sound.h
index b282748a9a208961c4b1341bff4b2ec03dc097cf..9288010a410127e88b9b421ee2548362a2d6d35a 100644 (file)
--- 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

diff --git a/include/wx/osx/spinbutt.h b/include/wx/osx/spinbutt.h
index af5d5ef1a65dc910afe0417ea4e0250f8c655de1..395b540c4d1e91b6e45913235ffc8ef0e77bedfd 100644 (file)
--- 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

diff --git a/include/wx/osx/spinctrl.h b/include/wx/osx/spinctrl.h
index 77da03667c77f21e16194f6f8c5b9777516c6a7d..11d6944b799aa50b3fde171f447db5b96a638ee3 100644 (file)
--- 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

diff --git a/include/wx/osx/srchctrl.h b/include/wx/osx/srchctrl.h
index 91f957a5210b4816a3814e2be527f9e727c85bdf..90b98e03b4734c53c17c1f06ae4facd5f047b6ca 100644 (file)
--- 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

diff --git a/include/wx/osx/statbmp.h b/include/wx/osx/statbmp.h
index 6db8aa80ae4a95ad48f13f282ccf6f137a56f955..01cb68184b085a1d041d5c2d8a6c0f07bcb1fc51 100644 (file)
--- 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

diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h
index b0cbc8774cccec1caa5e7f853774c565775ab3a4..93b0313f7f875c6ebad432a64c1cac9270043cb7 100644 (file)
--- 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

diff --git a/include/wx/osx/statline.h b/include/wx/osx/statline.h
index 68324363ed9da48e053ae80f07e99aa01ea8a41b..416ee24a1c15c507a850dcce7f45d364c3911bb6 100644 (file)
--- 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

diff --git a/include/wx/osx/stattext.h b/include/wx/osx/stattext.h
index 4e57c31441bb892dc0f85ad72cb6dffa05c6b269..9588f2483255b272e38441b8bfab1d1800377e42 100644 (file)
--- 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

diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h
index 01e17c56677e804fd5add8d743326fe7d26f8044..8d04cca4f6fd5d1a68a9e4311352c070660258ce 100644 (file)
--- 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

diff --git a/include/wx/osx/tabctrl.h b/include/wx/osx/tabctrl.h
index 356b4a9e461c99bb48074b23d86002fe45f023fb..47742c16774d893869cd1f454b0f86cb8f7de8e4 100644 (file)
--- 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

diff --git a/include/wx/osx/taskbarosx.h b/include/wx/osx/taskbarosx.h
index 07815224cb9699b22381248c5f98c30eb4ab897f..4e893ad54fcdb30f4c075f8b1384998c003347f5 100644 (file)
--- 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

diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index fe1bd4caeae626af385152f4f4a27087ed6f67b4..3edbf1504c056829d58bbf654746bb7621058534 100644 (file)
--- 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

diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h
index c7104ac928e3290402f872d3701ad45c673ee9fe..17f082b5d23977c7d314ac8cd6bd90f68d3e5d99 100644 (file)
--- 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
\ No newline at end of file

diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h
index 8f553dbdb324366656b618af9c7f51822e04fad8..018be6a4249ce5a29f8351dedd4e4e344f69de3e 100644 (file)
--- 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

diff --git a/include/wx/osx/tooltip.h b/include/wx/osx/tooltip.h
index 46a0bf8180a961f512b17a0e28816d3fdb36a370..0e46d170058664cff382c097cbffe2fa15a28552 100644 (file)
--- 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

diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h
index fbc25b562345a2ed955eb5f8301bd212c8e452b0..108a842c30b6f41973a863b568786576f11c5da2 100644 (file)
--- 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

diff --git a/include/wx/osx/treectrl.h b/include/wx/osx/treectrl.h
index 09a33f0daee44cce5467694b0bc281ce0f4af408..431a17775c4db3129d2c82f3de5a3b0b43198d70 100644 (file)
--- 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
\ No newline at end of file

diff --git a/include/wx/osx/uma.h b/include/wx/osx/uma.h
index 16995b9c475fbc79c52cfef68ff865ab2ad71c7f..46ded9e42bdbd53999c63f3e47879cfbe1201517 100644 (file)
--- 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

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 14b131e37b5f7bb4508d8e6559e47195ea787792..ccd9b71b6150ee6af85ff9ae7fc115d545c03e43 100644 (file)
--- 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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 8f9183cdfbd503657c26d08c151b74b1b2df849c..02edb405b556319248d17aad9ed143827444b5aa 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -39,7 +39,7 @@ public:
 #elif defined(__WXMGL__)
     #include "wx/mgl/palette.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/palette.h"
+    #include "wx/osx/palette.h"
 #elif defined(__WXPM__)
     #include "wx/os2/palette.h"
 #endif

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 36c2bd1f7a025b36faea0e119e82e43be10abff6..53069c51e5d05d10f352dc47af0be9abf563f6fb 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -106,7 +106,7 @@ public:
 #elif defined(__WXDFB__)
 #include "wx/dfb/pen.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/pen.h"
+#include "wx/osx/pen.h"
 #elif defined(__WXCOCOA__)
 #include "wx/cocoa/pen.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/platform.h b/include/wx/platform.h
index f64a2d2f67181b9ca622799b53c6fd427b226822..8c7faf3b322e9c8932b68762847be4b3264e6073 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -41,7 +41,9 @@
 
 #ifdef __WXOSX__
 /* for backwards compatibility of code (including our own) define __WXMAC__ */
+#ifndef __WXMAC__
 #define __WXMAC__
+#endif
 /* setup precise defines according to sdk used */
 #   include <TargetConditionals.h>
 #   if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
@@ -100,7 +102,7 @@
 #        include <unistd.h>
 #        include <TargetConditionals.h>
 #        include <AvailabilityMacros.h>
-#        include "wx/mac/config_xcode.h"
+#        include "wx/osx/config_xcode.h"
 #    endif
 #endif
 /*

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 6e10cc2c36935f5d38e027b152099b2295023e94..372bf523d4a14a75e01b4ad7c56c25aaf7725f81 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -69,7 +69,7 @@ public:
 #elif defined(__WXMGL__)
     #include "wx/mgl/popupwin.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/popupwin.h"
+    #include "wx/osx/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif

diff --git a/include/wx/print.h b/include/wx/print.h
index ef851dde8c625de65abad9c93cdee8d589d8ecf6..12160a8e1a56afb7589f33b4db4666b3531514c4 100644 (file)
--- a/include/wx/print.h
+++ b/include/wx/print.h
@@ -22,7 +22,7 @@
 
 #elif defined(__WXMAC__)
 
-#include "wx/mac/printmac.h"
+#include "wx/osx/printmac.h"
 
 #elif defined(__WXPM__)
 

diff --git a/include/wx/private/overlay.h b/include/wx/private/overlay.h
index 2f04ec61571056eba7d0f8f5a7d4eaf62d1cf536..fa6b3dbe07baa32c4bb9c492cecf1316c7d58cea 100644 (file)
--- a/include/wx/private/overlay.h
+++ b/include/wx/private/overlay.h
@@ -17,7 +17,7 @@
 #ifdef wxHAS_NATIVE_OVERLAY
 
 #if defined(__WXMAC__)
-    #include "wx/mac/carbon/private/overlay.h"
+    #include "wx/osx/carbon/private/overlay.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/private/overlay.h"
 #else

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 153927aec8d771f953dddfd64d98f055d92b7c8f..f8d1a6ef48ed430f4ef5c9e0abd3181f1dc9ccc3 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -160,7 +160,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/radiobox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/radiobox.h"
+    #include "wx/osx/radiobox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/radiobox.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index 33b04ef936559a50988748464ef3fd41cda4ed0b..44e24d0234e95f73ab46aeb8fc7e2d8322def845 100644 (file)
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -46,7 +46,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioButtonNameStr[];
 #elif defined(__WXGTK__)
     #include "wx/gtk1/radiobut.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/radiobut.h"
+    #include "wx/osx/radiobut.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/radiobut.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/region.h b/include/wx/region.h
index 1b1f627953efeb3a282fd2470762a33303b5ee60..a4cf196b0726fa397a2687c31462322d5fd3db46 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -228,7 +228,7 @@ protected:
 #elif defined(__WXDFB__)
     #include "wx/dfb/region.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/region.h"
+    #include "wx/osx/region.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/region.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 868c0ff593b84cc3527fb26287fa218d5403a74d..4fd9e3d0648cf5988eed8ac0f26398b2c852729a 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -70,7 +70,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/scrolbar.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/scrolbar.h"
+    #include "wx/osx/scrolbar.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/scrolbar.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 6294fabc1a6151d202a3265b9b310868c61b78f3..7a92223486d1a6445204fa7159fdca37039c448b 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -136,7 +136,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/slider.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/slider.h"
+    #include "wx/osx/slider.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/sound.h b/include/wx/sound.h
index a0c780488f8b114c8d141f8ebac8f03628cf63e7..380baf2f1d7055427f87dbb955ff0400e639e12f 100644 (file)
--- a/include/wx/sound.h
+++ b/include/wx/sound.h
@@ -60,7 +60,7 @@ protected:
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/sound.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/sound.h"
+    #include "wx/osx/sound.h"
 #elif defined(__WXPM__)
     #include "wx/os2/sound.h"
 #elif defined(__UNIX__)

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 820e8c33b4ed90bff404c9e039f751f16430f6c3..feec6b791c2016ae805e7f0c82015999aa31dc93 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -83,7 +83,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/spinbutt.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/spinbutt.h"
+    #include "wx/osx/spinbutt.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/spinbutt.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 5c00f53410747a91943a8f70119b93e5f24e0cc4..76c4a3f5522666c1b08ec4b6e578a0ada2dae8cb 100644 (file)
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -126,7 +126,7 @@ typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
     #include "wx/gtk1/spinctrl.h"
 #elif defined(__WXMAC__)
     #define wxHAS_NATIVE_SPINCTRL
-    #include "wx/mac/spinctrl.h"
+    #include "wx/osx/spinctrl.h"
 #endif // platform
 
 #if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE)

diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index 32cc614d958c05f418e4b2fbd32c0c96e5d0c349..17e18884dcbc2ee17675c9a914cd29c991ce9f02 100644 (file)
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -70,7 +70,7 @@ public:
 // include the platform-dependent class implementation
 #if wxUSE_NATIVE_SEARCH_CONTROL
     #if defined(__WXMAC__)
-        #include "wx/mac/srchctrl.h"
+        #include "wx/osx/srchctrl.h"
     #endif
 #else
     #include "wx/generic/srchctlg.h"

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 72934c25e6c116767c5fa57619fc16a3450a8516..9278aa0974d5c74297c07c2812dcdfdc56786561 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -64,7 +64,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/statbmp.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/statbmp.h"
+    #include "wx/osx/statbmp.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbmp.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index e8f48c3eb398b766139cbe986da4bab91456b0dd..203790654a6e0875a5632d66ba9a2d86e71495df 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -64,7 +64,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/statbox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/statbox.h"
+    #include "wx/osx/statbox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbox.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/statline.h b/include/wx/statline.h
index 8b36eb4c8c86732a11f74bc2369ee9f97a4da13e..9cdd7ffd2e8e726efc1bc3590ff47260150944e2 100644 (file)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -94,7 +94,7 @@ protected:
 #elif defined(__WXPM__)
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/statline.h"
+    #include "wx/osx/statline.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statline.h"
 #else // use generic implementation for all other platforms

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index e6e38f1da4af64d32f55955f7533ccf6d89f4624..d23d88d4c1d6b87758ab388dde52fe026a7f6a4b 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -111,7 +111,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/stattext.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/stattext.h"
+    #include "wx/osx/stattext.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/stattext.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index f75d0537203b87c3ca0f3051f24af868179a7837..bccef6f4035a5351b81d4c3d6b581e6106309cc5 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -163,7 +163,7 @@ protected:
     #define wxStatusBarMac wxStatusBar
 
     #include "wx/generic/statusbr.h"
-    #include "wx/mac/statusbr.h"
+    #include "wx/osx/statusbr.h"
 #else
     #define wxStatusBarGeneric wxStatusBar
 

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 999720d3ac0b26190b96a2bd0619392d215bca5e..f32d6ee95833e2ea95b8193348e25955b36b44d0 100644 (file)
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -169,7 +169,7 @@ protected:
         #define wxHAS_NATIVE_STDPATHS
     // We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
     #elif defined(__WXMAC__) || defined(__DARWIN__)
-        #include "wx/mac/corefoundation/stdpaths.h"
+        #include "wx/osx/core/stdpaths.h"
         #define wxHAS_NATIVE_STDPATHS
     #elif defined(__OS2__)
         #include "wx/os2/stdpaths.h"

diff --git a/include/wx/tabctrl.h b/include/wx/tabctrl.h
index 4337e4eb8f33dcba57181152801e0858d20d3b1e..4bbf65eaf2099d90774ca5bcdb73f7adea751bce 100644 (file)
--- a/include/wx/tabctrl.h
+++ b/include/wx/tabctrl.h
@@ -22,7 +22,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING;
 #if defined(__WXMSW__)
     #include "wx/msw/tabctrl.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/tabctrl.h"
+    #include "wx/osx/tabctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/tabctrl.h"
 #endif

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index 96eef52049e7fe30a8b7a83cc6d4302af1994bb7..f3dedd4b6ea849b50607ed46a90315a07b09bac0 100644 (file)
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -62,7 +62,7 @@ private:
 #elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
     #include "wx/unix/taskbarx11.h"
 #elif defined (__WXMAC__)
-    #include "wx/mac/taskbarosx.h"
+    #include "wx/osx/taskbarosx.h"
 #elif defined (__WXCOCOA__)
     #include "wx/cocoa/taskbar.h"
 #endif

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 952862d44ed4a4942b27979d9ff7f0ec9b08dd15..0aae25a47947bbdfbedadac82f17e47b81b5ede5 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -688,7 +688,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/textctrl.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/textctrl.h"
+    #include "wx/osx/textctrl.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/textctrl.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index e4ab3394dc0db397f169f79dcc5c3c176d278924..ccb80dce96a6c20bf60ea0b0f229b583f0000d46 100644 (file)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -83,7 +83,7 @@ protected:
 # elif defined(__WXMOTIF__)
     #include "wx/motif/tglbtn.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/tglbtn.h"
+    #include "wx/osx/tglbtn.h"
 #elif defined(__WXPALMOS__)
     #include "wx/palmos/tglbtn.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index cb1c66eb456e2150bdae8114bbfe967697372c62..0fec2feea7ece5a00944f86847ad6942586983b8 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -81,7 +81,7 @@ enum
     #elif defined(__WXGTK__)
         #include "wx/gtk1/tbargtk.h"
     #elif defined(__WXMAC__)
-       #include "wx/mac/toolbar.h"
+       #include "wx/osx/toolbar.h"
     #elif defined(__WXCOCOA__)
        #include "wx/cocoa/toolbar.h"
     #elif defined(__WXPM__)

diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h
index 0e4ed84c8b0b3a1c3cf5931a788eb87acdad3201..4f9af4be4bdd19adb6b3601a881e63729fe29ea5 100644 (file)
--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@@ -25,7 +25,7 @@
 #elif defined(__WXGTK__)
 #include "wx/gtk1/tooltip.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/tooltip.h"
+#include "wx/osx/tooltip.h"
 #elif defined(__WXCOCOA__)
 #include "wx/cocoa/tooltip.h"
 #elif defined(__WXPM__)

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 3a63759cbc834435de146d39cd317499f153b596..2421a6eb23fe10aea28ce63d2541a943d5828ac8 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -328,7 +328,7 @@ protected:
     #include "wx/dfb/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowDFB
 #elif defined(__WXMAC__)
-    #include "wx/mac/toplevel.h"
+    #include "wx/osx/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMac
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/toplevel.h"

diff --git a/include/wx/window.h b/include/wx/window.h
index ae6b8d16619a33f27ab8e0b3063a78ea2e60117b..fc3f46dbc0d60870762c2b3b3f00bcc64d3c1e0b 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1709,7 +1709,7 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
     #else // !wxUniv
         #define wxWindowMac wxWindow
     #endif // wxUniv
-    #include "wx/mac/window.h"
+    #include "wx/osx/window.h"
 #elif defined(__WXCOCOA__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowCocoa