From 1f0c8f31f407ecfce909060464c0ea655221cdab Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 11 Jun 2008 19:30:52 +0000 Subject: [PATCH] fixing file paths after renaming git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/aboutdlg.cpp | 2 +- src/osx/carbon/app.cpp | 2 +- src/osx/carbon/bitmap.cpp | 2 +- src/osx/carbon/bmpbuttn.cpp | 2 +- src/osx/carbon/brush.cpp | 2 +- src/osx/carbon/button.cpp | 2 +- src/osx/carbon/cfsocket.cpp | 2 +- src/osx/carbon/checkbox.cpp | 2 +- src/osx/carbon/checklst.cpp | 2 +- src/osx/carbon/choice.cpp | 2 +- src/osx/carbon/clipbrd.cpp | 2 +- src/osx/carbon/colordlg.cpp | 4 ++-- src/osx/carbon/colordlgosx.mm | 2 +- src/osx/carbon/colour.cpp | 2 +- src/osx/carbon/combobox.cpp | 2 +- src/osx/carbon/combobxc.cpp | 2 +- src/osx/carbon/control.cpp | 4 ++-- src/osx/carbon/cursor.cpp | 2 +- src/osx/carbon/databrow.cpp | 6 +++--- src/osx/carbon/dataobj.cpp | 2 +- src/osx/carbon/dataview.cpp | 2 +- src/osx/carbon/dcclient.cpp | 2 +- src/osx/carbon/dcmemory.cpp | 4 ++-- src/osx/carbon/dcprint.cpp | 6 +++--- src/osx/carbon/dcscreen.cpp | 4 ++-- src/osx/carbon/dialog.cpp | 2 +- src/osx/carbon/dirdlg.cpp | 2 +- src/osx/carbon/dirmac.cpp | 2 +- src/osx/carbon/dnd.cpp | 2 +- src/osx/carbon/drawer.cpp | 4 ++-- src/osx/carbon/filedlg.cpp | 2 +- src/osx/carbon/font.cpp | 2 +- src/osx/carbon/fontdlg.cpp | 4 ++-- src/osx/carbon/fontdlgosx.mm | 2 +- src/osx/carbon/fontenum.cpp | 2 +- src/osx/carbon/frame.cpp | 2 +- src/osx/carbon/gauge.cpp | 2 +- src/osx/carbon/gdiobj.cpp | 2 +- src/osx/carbon/glcanvas.cpp | 4 ++-- src/osx/carbon/graphics.cpp | 6 +++--- src/osx/carbon/icon.cpp | 2 +- src/osx/carbon/listbox.cpp | 2 +- src/osx/carbon/listctrl_mac.cpp | 2 +- src/osx/carbon/mdi.cpp | 4 ++-- src/osx/carbon/mediactrl.cpp | 2 +- src/osx/carbon/menu.cpp | 2 +- src/osx/carbon/menuitem.cpp | 2 +- src/osx/carbon/metafile.cpp | 4 ++-- src/osx/carbon/mimetmac.cpp | 6 +++--- src/osx/carbon/msgdlg.cpp | 2 +- src/osx/carbon/nonownedwnd.cpp | 2 +- src/osx/carbon/notebmac.cpp | 2 +- src/osx/carbon/popupwin.cpp | 2 +- src/osx/carbon/printdlg.cpp | 6 +++--- src/osx/carbon/printmac.cpp | 8 ++++---- src/osx/carbon/radiobox.cpp | 2 +- src/osx/carbon/radiobut.cpp | 2 +- src/osx/carbon/region.cpp | 2 +- src/osx/carbon/renderer.cpp | 2 +- src/osx/carbon/scrolbar.cpp | 2 +- src/osx/carbon/settings.cpp | 2 +- src/osx/carbon/slider.cpp | 2 +- src/osx/carbon/sound.cpp | 2 +- src/osx/carbon/spinbutt.cpp | 2 +- src/osx/carbon/srchctrl.cpp | 4 ++-- src/osx/carbon/statbox.cpp | 2 +- src/osx/carbon/statbrma.cpp | 2 +- src/osx/carbon/statlmac.cpp | 2 +- src/osx/carbon/stattext.cpp | 2 +- src/osx/carbon/tabctrl.cpp | 2 +- src/osx/carbon/taskbar.cpp | 2 +- src/osx/carbon/textctrl.cpp | 4 ++-- src/osx/carbon/tglbtn.cpp | 2 +- src/osx/carbon/thread.cpp | 2 +- src/osx/carbon/timer.cpp | 4 ++-- src/osx/carbon/toolbar.cpp | 2 +- src/osx/carbon/tooltip.cpp | 2 +- src/osx/carbon/toplevel.cpp | 4 ++-- src/osx/carbon/uma.cpp | 4 ++-- src/osx/carbon/utils.cpp | 6 +++--- src/osx/carbon/utilscocoa.mm | 2 +- src/osx/carbon/window.cpp | 2 +- 82 files changed, 111 insertions(+), 111 deletions(-) diff --git a/src/osx/carbon/aboutdlg.cpp b/src/osx/carbon/aboutdlg.cpp index 243de8b7d7..eca978068f 100644 --- a/src/osx/carbon/aboutdlg.cpp +++ b/src/osx/carbon/aboutdlg.cpp @@ -27,7 +27,7 @@ #include "wx/aboutdlg.h" #include "wx/generic/aboutdlgg.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" // helper class for HIAboutBox options class AboutBoxOptions : public wxCFRef diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp index a75a511279..17fde1212d 100644 --- a/src/osx/carbon/app.cpp +++ b/src/osx/carbon/app.cpp @@ -45,7 +45,7 @@ // mac -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #ifdef __DARWIN__ # include diff --git a/src/osx/carbon/bitmap.cpp b/src/osx/carbon/bitmap.cpp index 1183eb0fbb..42242ccbfa 100644 --- a/src/osx/carbon/bitmap.cpp +++ b/src/osx/carbon/bitmap.cpp @@ -28,7 +28,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) -#include "wx/mac/private.h" +#include "wx/osx/private.h" #ifndef __WXOSX_IPHONE__ #include #endif diff --git a/src/osx/carbon/bmpbuttn.cpp b/src/osx/carbon/bmpbuttn.cpp index 5757f50b84..36512500e3 100644 --- a/src/osx/carbon/bmpbuttn.cpp +++ b/src/osx/carbon/bmpbuttn.cpp @@ -22,7 +22,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" //--------------------------------------------------------------------------- // Helper functions diff --git a/src/osx/carbon/brush.cpp b/src/osx/carbon/brush.cpp index 84dd60d6e9..d7ec6a3369 100644 --- a/src/osx/carbon/brush.cpp +++ b/src/osx/carbon/brush.cpp @@ -17,7 +17,7 @@ #include "wx/utils.h" #endif -#include "wx/mac/private.h" +#include "wx/osx/private.h" IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject) diff --git a/src/osx/carbon/button.cpp b/src/osx/carbon/button.cpp index 87fa56c82b..021ddac112 100644 --- a/src/osx/carbon/button.cpp +++ b/src/osx/carbon/button.cpp @@ -21,7 +21,7 @@ #include "wx/stockitem.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) diff --git a/src/osx/carbon/cfsocket.cpp b/src/osx/carbon/cfsocket.cpp index 8a2383c7f5..480a061840 100644 --- a/src/osx/carbon/cfsocket.cpp +++ b/src/osx/carbon/cfsocket.cpp @@ -34,7 +34,7 @@ #include "wx/apptrait.h" #include "wx/sckaddr.h" -#include "wx/mac/carbon/private.h" +#include "wx/osx/carbon/private.h" #include #include diff --git a/src/osx/carbon/checkbox.cpp b/src/osx/carbon/checkbox.cpp index 982869b0aa..ccb5ab2afb 100644 --- a/src/osx/carbon/checkbox.cpp +++ b/src/osx/carbon/checkbox.cpp @@ -14,7 +14,7 @@ #if wxUSE_CHECKBOX #include "wx/checkbox.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) diff --git a/src/osx/carbon/checklst.cpp b/src/osx/carbon/checklst.cpp index 5f0fecb5e2..adff768e25 100644 --- a/src/osx/carbon/checklst.cpp +++ b/src/osx/carbon/checklst.cpp @@ -22,7 +22,7 @@ #include "wx/arrstr.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) diff --git a/src/osx/carbon/choice.cpp b/src/osx/carbon/choice.cpp index c395a39d19..c0bd7f8abe 100644 --- a/src/osx/carbon/choice.cpp +++ b/src/osx/carbon/choice.cpp @@ -20,7 +20,7 @@ #include "wx/dcclient.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" extern MenuHandle NewUniqueMenu() ; diff --git a/src/osx/carbon/clipbrd.cpp b/src/osx/carbon/clipbrd.cpp index 7acd5845f4..c05e24d120 100644 --- a/src/osx/carbon/clipbrd.cpp +++ b/src/osx/carbon/clipbrd.cpp @@ -27,7 +27,7 @@ #include "wx/metafile.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #define wxUSE_DATAOBJ 1 diff --git a/src/osx/carbon/colordlg.cpp b/src/osx/carbon/colordlg.cpp index 377276d0c4..1fe4e3d151 100644 --- a/src/osx/carbon/colordlg.cpp +++ b/src/osx/carbon/colordlg.cpp @@ -12,7 +12,7 @@ #include "wx/wxprec.h" -#include "wx/mac/colordlg.h" +#include "wx/osx/colordlg.h" #include "wx/fontdlg.h" @@ -20,7 +20,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog) -#include "wx/mac/private.h" +#include "wx/osx/private.h" /* * wxColourDialog diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm index ea058c24f7..4c6f3a3ad8 100644 --- a/src/osx/carbon/colordlgosx.mm +++ b/src/osx/carbon/colordlgosx.mm @@ -20,7 +20,7 @@ #include "wx/wxprec.h" -#include "wx/mac/colordlg.h" +#include "wx/osx/colordlg.h" #include "wx/fontdlg.h" // ============================================================================ diff --git a/src/osx/carbon/colour.cpp b/src/osx/carbon/colour.cpp index 9eb24718a3..f46a19e9e7 100644 --- a/src/osx/carbon/colour.cpp +++ b/src/osx/carbon/colour.cpp @@ -17,7 +17,7 @@ #include "wx/gdicmn.h" #endif -#include "wx/mac/private.h" +#include "wx/osx/private.h" IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) diff --git a/src/osx/carbon/combobox.cpp b/src/osx/carbon/combobox.cpp index 90ba52c9c8..1174358e29 100644 --- a/src/osx/carbon/combobox.cpp +++ b/src/osx/carbon/combobox.cpp @@ -23,7 +23,7 @@ #include "wx/textctrl.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) diff --git a/src/osx/carbon/combobxc.cpp b/src/osx/carbon/combobxc.cpp index c494f9fada..8a67fd323f 100644 --- a/src/osx/carbon/combobxc.cpp +++ b/src/osx/carbon/combobxc.cpp @@ -18,7 +18,7 @@ #include "wx/menu.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #if TARGET_API_MAC_OSX #ifndef __HIVIEW__ #include diff --git a/src/osx/carbon/control.cpp b/src/osx/carbon/control.cpp index f787ea9812..e8874e6a8c 100644 --- a/src/osx/carbon/control.cpp +++ b/src/osx/carbon/control.cpp @@ -31,8 +31,8 @@ #include "wx/tabctrl.h" #include "wx/spinbutt.h" -#include "wx/mac/uma.h" -#include "wx/mac/private.h" +#include "wx/osx/uma.h" +#include "wx/osx/private.h" IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) diff --git a/src/osx/carbon/cursor.cpp b/src/osx/carbon/cursor.cpp index 36e40a7de9..af2f32a726 100644 --- a/src/osx/carbon/cursor.cpp +++ b/src/osx/carbon/cursor.cpp @@ -21,7 +21,7 @@ #include "wx/xpmdecod.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxGDIObject) diff --git a/src/osx/carbon/databrow.cpp b/src/osx/carbon/databrow.cpp index 6d4e55cc5b..33a9a582ec 100644 --- a/src/osx/carbon/databrow.cpp +++ b/src/osx/carbon/databrow.cpp @@ -23,9 +23,9 @@ #endif #include "wx/dataview.h" -#include "wx/mac/carbon/databrow.h" -#include "wx/mac/private.h" -#include "wx/mac/uma.h" +#include "wx/osx/carbon/databrow.h" +#include "wx/osx/private.h" +#include "wx/osx/uma.h" #include diff --git a/src/osx/carbon/dataobj.cpp b/src/osx/carbon/dataobj.cpp index cdec68b05d..3b9de39223 100644 --- a/src/osx/carbon/dataobj.cpp +++ b/src/osx/carbon/dataobj.cpp @@ -27,7 +27,7 @@ #include "wx/metafile.h" #include "wx/tokenzr.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #ifdef __DARWIN__ #include diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp index 5dd666c1ca..e6435e32fb 100644 --- a/src/osx/carbon/dataview.cpp +++ b/src/osx/carbon/dataview.cpp @@ -18,7 +18,7 @@ #include -#include "wx/mac/carbon/databrow.h" +#include "wx/osx/carbon/databrow.h" #ifndef WX_PRECOMP #include "wx/timer.h" diff --git a/src/osx/carbon/dcclient.cpp b/src/osx/carbon/dcclient.cpp index a7f4cb2536..00b970dd9a 100644 --- a/src/osx/carbon/dcclient.cpp +++ b/src/osx/carbon/dcclient.cpp @@ -25,7 +25,7 @@ #include "wx/graphics.h" #include "wx/rawbmp.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" //----------------------------------------------------------------------------- // wxWindowDCImpl diff --git a/src/osx/carbon/dcmemory.cpp b/src/osx/carbon/dcmemory.cpp index 4567352d94..e75442fb9c 100644 --- a/src/osx/carbon/dcmemory.cpp +++ b/src/osx/carbon/dcmemory.cpp @@ -13,9 +13,9 @@ #include "wx/dcmemory.h" #include "wx/graphics.h" -#include "wx/mac/dcmemory.h" +#include "wx/osx/dcmemory.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" //----------------------------------------------------------------------------- // wxMemoryDCImpl diff --git a/src/osx/carbon/dcprint.cpp b/src/osx/carbon/dcprint.cpp index ccc58d99ff..7bec2b5eaf 100644 --- a/src/osx/carbon/dcprint.cpp +++ b/src/osx/carbon/dcprint.cpp @@ -25,9 +25,9 @@ #include "wx/math.h" #endif -#include "wx/mac/uma.h" -#include "wx/mac/private/print.h" -#include "wx/mac/carbon/dcprint.h" +#include "wx/osx/uma.h" +#include "wx/osx/private/print.h" +#include "wx/osx/carbon/dcprint.h" #include "wx/graphics.h" IMPLEMENT_ABSTRACT_CLASS(wxPrinterDCImpl, wxGCDCImpl) diff --git a/src/osx/carbon/dcscreen.cpp b/src/osx/carbon/dcscreen.cpp index ad8ac0be4a..521f73b3ae 100644 --- a/src/osx/carbon/dcscreen.cpp +++ b/src/osx/carbon/dcscreen.cpp @@ -12,9 +12,9 @@ #include "wx/wxprec.h" #include "wx/dcscreen.h" -#include "wx/mac/carbon/dcscreen.h" +#include "wx/osx/carbon/dcscreen.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #include "wx/graphics.h" IMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl) diff --git a/src/osx/carbon/dialog.cpp b/src/osx/carbon/dialog.cpp index 8743e10547..19dbf02e88 100644 --- a/src/osx/carbon/dialog.cpp +++ b/src/osx/carbon/dialog.cpp @@ -20,7 +20,7 @@ #include "wx/settings.h" #endif // WX_PRECOMP -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" // Lists to keep track of windows, so we can disable/enable them diff --git a/src/osx/carbon/dirdlg.cpp b/src/osx/carbon/dirdlg.cpp index 5caa7f6b4b..6fc40059c7 100644 --- a/src/osx/carbon/dirdlg.cpp +++ b/src/osx/carbon/dirdlg.cpp @@ -23,7 +23,7 @@ #include "wx/filename.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" #ifdef __DARWIN__ #include diff --git a/src/osx/carbon/dirmac.cpp b/src/osx/carbon/dirmac.cpp index 52e9a61e0f..06ccef1960 100644 --- a/src/osx/carbon/dirmac.cpp +++ b/src/osx/carbon/dirmac.cpp @@ -33,7 +33,7 @@ #include "wx/filefn.h" // for wxDirExists() #include "wx/filename.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" // ---------------------------------------------------------------------------- // private classes diff --git a/src/osx/carbon/dnd.cpp b/src/osx/carbon/dnd.cpp index 11709e12ce..b5d299b476 100644 --- a/src/osx/carbon/dnd.cpp +++ b/src/osx/carbon/dnd.cpp @@ -21,7 +21,7 @@ #include "wx/gdicmn.h" #endif // WX_PRECOMP -#include "wx/mac/private.h" +#include "wx/osx/private.h" // ---------------------------------------------------------------------------- // globals diff --git a/src/osx/carbon/drawer.cpp b/src/osx/carbon/drawer.cpp index 4adb28e239..9c2368fe90 100644 --- a/src/osx/carbon/drawer.cpp +++ b/src/osx/carbon/drawer.cpp @@ -14,11 +14,11 @@ #include "wx/wxprec.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" #if defined( __WXMAC__ ) -#include "wx/mac/carbon/drawer.h" +#include "wx/osx/carbon/drawer.h" IMPLEMENT_DYNAMIC_CLASS(wxDrawerWindow, wxWindow) diff --git a/src/osx/carbon/filedlg.cpp b/src/osx/carbon/filedlg.cpp index 6e43845335..b42165fde3 100644 --- a/src/osx/carbon/filedlg.cpp +++ b/src/osx/carbon/filedlg.cpp @@ -25,7 +25,7 @@ #include "wx/tokenzr.h" #include "wx/filename.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" #ifndef __DARWIN__ #include diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index d069f3c89e..da34391d86 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -25,7 +25,7 @@ #include "wx/graphics.h" #include "wx/settings.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #ifndef __DARWIN__ #include diff --git a/src/osx/carbon/fontdlg.cpp b/src/osx/carbon/fontdlg.cpp index e7892ad542..07ec5c6f1a 100644 --- a/src/osx/carbon/fontdlg.cpp +++ b/src/osx/carbon/fontdlg.cpp @@ -46,7 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" // --------------------------------------------------------------------------- // wxFontDialog @@ -261,7 +261,7 @@ int wxFontDialog::ShowModal() #undef wxFontDialog -#include "wx/mac/fontdlg.h" +#include "wx/osx/fontdlg.h" #include "wx/fontenum.h" #include "wx/colordlg.h" diff --git a/src/osx/carbon/fontdlgosx.mm b/src/osx/carbon/fontdlgosx.mm index 55071430b2..b0f144ca59 100644 --- a/src/osx/carbon/fontdlgosx.mm +++ b/src/osx/carbon/fontdlgosx.mm @@ -42,7 +42,7 @@ #import #import -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" @interface wxMacFontPanelAccView : NSView { diff --git a/src/osx/carbon/fontenum.cpp b/src/osx/carbon/fontenum.cpp index ce9718ed10..3355abf21e 100644 --- a/src/osx/carbon/fontenum.cpp +++ b/src/osx/carbon/fontenum.cpp @@ -25,7 +25,7 @@ #include "wx/fontmap.h" #include "wx/encinfo.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" // ---------------------------------------------------------------------------- // wxFontEnumerator diff --git a/src/osx/carbon/frame.cpp b/src/osx/carbon/frame.cpp index d17d5d8147..fb6b170ae8 100644 --- a/src/osx/carbon/frame.cpp +++ b/src/osx/carbon/frame.cpp @@ -24,7 +24,7 @@ #include "wx/menuitem.h" #endif // WX_PRECOMP -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) EVT_ACTIVATE(wxFrame::OnActivate) diff --git a/src/osx/carbon/gauge.cpp b/src/osx/carbon/gauge.cpp index b2f36abe95..57a83ed4f1 100644 --- a/src/osx/carbon/gauge.cpp +++ b/src/osx/carbon/gauge.cpp @@ -17,7 +17,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl) -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" bool wxGauge::Create( wxWindow *parent, wxWindowID id, diff --git a/src/osx/carbon/gdiobj.cpp b/src/osx/carbon/gdiobj.cpp index 76156134e0..ad33a80ba9 100644 --- a/src/osx/carbon/gdiobj.cpp +++ b/src/osx/carbon/gdiobj.cpp @@ -19,7 +19,7 @@ #endif #include "wx/link.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" // Linker will discard entire object file without this wxFORCE_LINK_THIS_MODULE(gdiobj) diff --git a/src/osx/carbon/glcanvas.cpp b/src/osx/carbon/glcanvas.cpp index 7d265bc1d6..4bfc12cc9e 100644 --- a/src/osx/carbon/glcanvas.cpp +++ b/src/osx/carbon/glcanvas.cpp @@ -33,9 +33,9 @@ #include "wx/settings.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" // ---------------------------------------------------------------------------- // helper functions diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index 3c65a99a8c..37596e8268 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -35,12 +35,12 @@ #endif #ifdef __WXMAC__ - #include "wx/mac/uma.h" - #include "wx/mac/dcprint.h" + #include "wx/osx/uma.h" + #include "wx/osx/dcprint.h" #else #include "CoreServices/CoreServices.h" #include "ApplicationServices/ApplicationServices.h" - #include "wx/mac/corefoundation/cfstring.h" + #include "wx/osx/core/cfstring.h" #include "wx/cocoa/dcclient.h" #endif diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp index c90a0b37c7..38e86abec3 100644 --- a/src/osx/carbon/icon.cpp +++ b/src/osx/carbon/icon.cpp @@ -17,7 +17,7 @@ #include "wx/image.h" #endif -#include "wx/mac/private.h" +#include "wx/osx/private.h" IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject) diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp index 8c479b1066..edd9f96e0f 100644 --- a/src/osx/carbon/listbox.cpp +++ b/src/osx/carbon/listbox.cpp @@ -29,7 +29,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems) BEGIN_EVENT_TABLE(wxListBox, wxControl) END_EVENT_TABLE() -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" // ============================================================================ // list box control implementation diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp index 13a20ac220..64641fae9c 100644 --- a/src/osx/carbon/listctrl_mac.cpp +++ b/src/osx/carbon/listctrl_mac.cpp @@ -33,7 +33,7 @@ #include "wx/settings.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #include "wx/imaglist.h" #include "wx/sysopt.h" diff --git a/src/osx/carbon/mdi.cpp b/src/osx/carbon/mdi.cpp index ca02c69c0d..02b33e5cf6 100644 --- a/src/osx/carbon/mdi.cpp +++ b/src/osx/carbon/mdi.cpp @@ -22,8 +22,8 @@ #include "wx/statusbr.h" #endif -#include "wx/mac/private.h" -#include "wx/mac/uma.h" +#include "wx/osx/private.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) diff --git a/src/osx/carbon/mediactrl.cpp b/src/osx/carbon/mediactrl.cpp index 9d525f5b59..475d02540a 100644 --- a/src/osx/carbon/mediactrl.cpp +++ b/src/osx/carbon/mediactrl.cpp @@ -46,7 +46,7 @@ #endif // uma is for wxMacFSSpec -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" // standard QT stuff #ifndef __DARWIN__ diff --git a/src/osx/carbon/menu.cpp b/src/osx/carbon/menu.cpp index 9311f4fdb6..5505797e2d 100644 --- a/src/osx/carbon/menu.cpp +++ b/src/osx/carbon/menu.cpp @@ -28,7 +28,7 @@ #include "wx/menuitem.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" // other standard headers // ---------------------- diff --git a/src/osx/carbon/menuitem.cpp b/src/osx/carbon/menuitem.cpp index efe921ff74..ada8a8be84 100644 --- a/src/osx/carbon/menuitem.cpp +++ b/src/osx/carbon/menuitem.cpp @@ -19,7 +19,7 @@ #include "wx/menu.h" #endif // WX_PRECOMP -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject) diff --git a/src/osx/carbon/metafile.cpp b/src/osx/carbon/metafile.cpp index 73d5b77f9a..464cd9ae63 100644 --- a/src/osx/carbon/metafile.cpp +++ b/src/osx/carbon/metafile.cpp @@ -24,9 +24,9 @@ #include "wx/metafile.h" #include "wx/clipbrd.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #include "wx/graphics.h" -#include "wx/mac/carbon/metafile.h" +#include "wx/osx/carbon/metafile.h" #include #include diff --git a/src/osx/carbon/mimetmac.cpp b/src/osx/carbon/mimetmac.cpp index 5f1593ea05..4bf9a586c2 100644 --- a/src/osx/carbon/mimetmac.cpp +++ b/src/osx/carbon/mimetmac.cpp @@ -32,7 +32,7 @@ #if wxUSE_MIMETYPE -#include "wx/mac/mimetype.h" +#include "wx/osx/mimetype.h" #ifndef WX_PRECOMP #include "wx/dynarray.h" @@ -48,7 +48,7 @@ #include "wx/file.h" #include "wx/confbase.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" // other standard headers #include @@ -752,7 +752,7 @@ pascal OSStatus MoreProcGetProcessTypeSignature( // // -#include "wx/mac/corefoundation/cfstring.h" +#include "wx/osx/core/cfstring.h" #define wxCF_RELEASE true #define wxCF_RETAIN false diff --git a/src/osx/carbon/msgdlg.cpp b/src/osx/carbon/msgdlg.cpp index 830efb6f27..3adc6bbca4 100644 --- a/src/osx/carbon/msgdlg.cpp +++ b/src/osx/carbon/msgdlg.cpp @@ -19,7 +19,7 @@ #endif #include "wx/thread.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_CLASS(wxMessageDialog, wxDialog) diff --git a/src/osx/carbon/nonownedwnd.cpp b/src/osx/carbon/nonownedwnd.cpp index 4c8d95e72e..6956f30700 100644 --- a/src/osx/carbon/nonownedwnd.cpp +++ b/src/osx/carbon/nonownedwnd.cpp @@ -20,7 +20,7 @@ #include "wx/tooltip.h" #include "wx/nonownedwnd.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" #include "wx/settings.h" #include "wx/frame.h" diff --git a/src/osx/carbon/notebmac.cpp b/src/osx/carbon/notebmac.cpp index 6d00a7130d..5a5504d8f6 100644 --- a/src/osx/carbon/notebmac.cpp +++ b/src/osx/carbon/notebmac.cpp @@ -24,7 +24,7 @@ #include "wx/string.h" #include "wx/imaglist.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" // check that the page index is valid diff --git a/src/osx/carbon/popupwin.cpp b/src/osx/carbon/popupwin.cpp index c2ecd3cf59..4889db8958 100644 --- a/src/osx/carbon/popupwin.cpp +++ b/src/osx/carbon/popupwin.cpp @@ -34,7 +34,7 @@ #include "wx/popupwin.h" #include "wx/tooltip.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" // ============================================================================ // implementation diff --git a/src/osx/carbon/printdlg.cpp b/src/osx/carbon/printdlg.cpp index 66d2adf22d..f7d1d1df67 100644 --- a/src/osx/carbon/printdlg.cpp +++ b/src/osx/carbon/printdlg.cpp @@ -24,9 +24,9 @@ #include "wx/stattext.h" #endif -#include "wx/mac/printdlg.h" -#include "wx/mac/private/print.h" -#include "wx/mac/private.h" +#include "wx/osx/printdlg.h" +#include "wx/osx/private/print.h" +#include "wx/osx/private.h" #include "wx/statline.h" diff --git a/src/osx/carbon/printmac.cpp b/src/osx/carbon/printmac.cpp index 6c34d746f9..d013871f94 100644 --- a/src/osx/carbon/printmac.cpp +++ b/src/osx/carbon/printmac.cpp @@ -27,14 +27,14 @@ #include "wx/math.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" -#include "wx/mac/printmac.h" -#include "wx/mac/private/print.h" +#include "wx/osx/printmac.h" +#include "wx/osx/private/print.h" #include "wx/printdlg.h" #include "wx/paper.h" -#include "wx/mac/printdlg.h" +#include "wx/osx/printdlg.h" #include diff --git a/src/osx/carbon/radiobox.cpp b/src/osx/carbon/radiobox.cpp index 69ce082c1b..9eae7ec48a 100644 --- a/src/osx/carbon/radiobox.cpp +++ b/src/osx/carbon/radiobox.cpp @@ -20,7 +20,7 @@ #include "wx/arrstr.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) diff --git a/src/osx/carbon/radiobut.cpp b/src/osx/carbon/radiobut.cpp index 7f866d2536..3fa8079c7b 100644 --- a/src/osx/carbon/radiobut.cpp +++ b/src/osx/carbon/radiobut.cpp @@ -14,7 +14,7 @@ #if wxUSE_RADIOBTN #include "wx/radiobut.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) diff --git a/src/osx/carbon/region.cpp b/src/osx/carbon/region.cpp index d08fd4984c..e645ea9e92 100644 --- a/src/osx/carbon/region.cpp +++ b/src/osx/carbon/region.cpp @@ -16,7 +16,7 @@ #include "wx/gdicmn.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject) diff --git a/src/osx/carbon/renderer.cpp b/src/osx/carbon/renderer.cpp index abcc1d6aa2..8eb4e180e7 100644 --- a/src/osx/carbon/renderer.cpp +++ b/src/osx/carbon/renderer.cpp @@ -27,7 +27,7 @@ #include "wx/renderer.h" #include "wx/graphics.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative diff --git a/src/osx/carbon/scrolbar.cpp b/src/osx/carbon/scrolbar.cpp index c7c1263451..fbf084395c 100644 --- a/src/osx/carbon/scrolbar.cpp +++ b/src/osx/carbon/scrolbar.cpp @@ -19,7 +19,7 @@ #include "wx/settings.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl) diff --git a/src/osx/carbon/settings.cpp b/src/osx/carbon/settings.cpp index 58cecfb357..ae7625872c 100644 --- a/src/osx/carbon/settings.cpp +++ b/src/osx/carbon/settings.cpp @@ -18,7 +18,7 @@ #include "wx/gdicmn.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" // ---------------------------------------------------------------------------- // wxSystemSettingsNative diff --git a/src/osx/carbon/slider.cpp b/src/osx/carbon/slider.cpp index ced51f397e..d79fe630c2 100644 --- a/src/osx/carbon/slider.cpp +++ b/src/osx/carbon/slider.cpp @@ -14,7 +14,7 @@ #if wxUSE_SLIDER #include "wx/slider.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl) diff --git a/src/osx/carbon/sound.cpp b/src/osx/carbon/sound.cpp index b3ff384fc8..ca532ebab5 100644 --- a/src/osx/carbon/sound.cpp +++ b/src/osx/carbon/sound.cpp @@ -45,7 +45,7 @@ // #ifdef __WXMAC__ -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #ifndef __DARWIN__ #include #include diff --git a/src/osx/carbon/spinbutt.cpp b/src/osx/carbon/spinbutt.cpp index 02ed2e9423..16bd9e4892 100644 --- a/src/osx/carbon/spinbutt.cpp +++ b/src/osx/carbon/spinbutt.cpp @@ -14,7 +14,7 @@ #if wxUSE_SPINBTN #include "wx/spinbutt.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) diff --git a/src/osx/carbon/srchctrl.cpp b/src/osx/carbon/srchctrl.cpp index 4a78629391..24919560de 100644 --- a/src/osx/carbon/srchctrl.cpp +++ b/src/osx/carbon/srchctrl.cpp @@ -25,8 +25,8 @@ #if wxUSE_NATIVE_SEARCH_CONTROL -#include "wx/mac/uma.h" -#include "wx/mac/carbon/private/mactext.h" +#include "wx/osx/uma.h" +#include "wx/osx/carbon/private/mactext.h" BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase) END_EVENT_TABLE() diff --git a/src/osx/carbon/statbox.cpp b/src/osx/carbon/statbox.cpp index 398fc5fcb2..a7eec879bb 100644 --- a/src/osx/carbon/statbox.cpp +++ b/src/osx/carbon/statbox.cpp @@ -14,7 +14,7 @@ #if wxUSE_STATBOX #include "wx/statbox.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) diff --git a/src/osx/carbon/statbrma.cpp b/src/osx/carbon/statbrma.cpp index 926198c3b0..ba190b0df3 100644 --- a/src/osx/carbon/statbrma.cpp +++ b/src/osx/carbon/statbrma.cpp @@ -21,7 +21,7 @@ #include "wx/toplevel.h" #endif -#include "wx/mac/private.h" +#include "wx/osx/private.h" BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric) diff --git a/src/osx/carbon/statlmac.cpp b/src/osx/carbon/statlmac.cpp index d0102cc8c3..2b74eb9912 100644 --- a/src/osx/carbon/statlmac.cpp +++ b/src/osx/carbon/statlmac.cpp @@ -31,7 +31,7 @@ #include "wx/statbox.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" // ============================================================================ // implementation diff --git a/src/osx/carbon/stattext.cpp b/src/osx/carbon/stattext.cpp index d0285e6b06..6763b3afee 100644 --- a/src/osx/carbon/stattext.cpp +++ b/src/osx/carbon/stattext.cpp @@ -26,7 +26,7 @@ #include "wx/notebook.h" #include "wx/tabctrl.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #include diff --git a/src/osx/carbon/tabctrl.cpp b/src/osx/carbon/tabctrl.cpp index bd557b762d..a55c65dfde 100644 --- a/src/osx/carbon/tabctrl.cpp +++ b/src/osx/carbon/tabctrl.cpp @@ -19,7 +19,7 @@ #include "wx/control.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxNotifyEvent) diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp index 9bb02f5124..b2f00b26ad 100644 --- a/src/osx/carbon/taskbar.cpp +++ b/src/osx/carbon/taskbar.cpp @@ -22,7 +22,7 @@ #include "wx/icon.h" #endif -#include "wx/mac/private.h" +#include "wx/osx/private.h" class wxTaskBarIconImpl { diff --git a/src/osx/carbon/textctrl.cpp b/src/osx/carbon/textctrl.cpp index b162a58860..3b21030e01 100644 --- a/src/osx/carbon/textctrl.cpp +++ b/src/osx/carbon/textctrl.cpp @@ -46,8 +46,8 @@ #include "wx/sysopt.h" #include "wx/thread.h" -#include "wx/mac/uma.h" -#include "wx/mac/carbon/private/mactext.h" +#include "wx/osx/uma.h" +#include "wx/osx/carbon/private/mactext.h" class wxMacFunctor { diff --git a/src/osx/carbon/tglbtn.cpp b/src/osx/carbon/tglbtn.cpp index 43904685f7..ced569714d 100644 --- a/src/osx/carbon/tglbtn.cpp +++ b/src/osx/carbon/tglbtn.cpp @@ -23,7 +23,7 @@ #if wxUSE_TOGGLEBTN #include "wx/tglbtn.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" // Button // ---------------------------------------------------------------------------- diff --git a/src/osx/carbon/thread.cpp b/src/osx/carbon/thread.cpp index 04383b0f94..6d23905e80 100644 --- a/src/osx/carbon/thread.cpp +++ b/src/osx/carbon/thread.cpp @@ -26,7 +26,7 @@ #include "wx/thread.h" #include -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" // the possible states of the thread: // ("=>" shows all possible transitions from this state) diff --git a/src/osx/carbon/timer.cpp b/src/osx/carbon/timer.cpp index c5beb16cf1..4ed70d9c93 100644 --- a/src/osx/carbon/timer.cpp +++ b/src/osx/carbon/timer.cpp @@ -17,10 +17,10 @@ #include "wx/dynarray.h" #endif -#include "wx/mac/private/timer.h" +#include "wx/osx/private/timer.h" #ifdef __WXMAC__ - #include "wx/mac/private.h" + #include "wx/osx/private.h" #endif struct MacTimerInfo diff --git a/src/osx/carbon/toolbar.cpp b/src/osx/carbon/toolbar.cpp index f0364473c9..9ff9f29cbf 100644 --- a/src/osx/carbon/toolbar.cpp +++ b/src/osx/carbon/toolbar.cpp @@ -20,7 +20,7 @@ #endif #include "wx/app.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #include "wx/geometry.h" #include "wx/sysopt.h" diff --git a/src/osx/carbon/tooltip.cpp b/src/osx/carbon/tooltip.cpp index 957feb0491..dadf0b2ef0 100644 --- a/src/osx/carbon/tooltip.cpp +++ b/src/osx/carbon/tooltip.cpp @@ -21,7 +21,7 @@ #endif // WX_PRECOMP #include "wx/geometry.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" //----------------------------------------------------------------------------- // global data diff --git a/src/osx/carbon/toplevel.cpp b/src/osx/carbon/toplevel.cpp index 92243b278d..fff13c351c 100644 --- a/src/osx/carbon/toplevel.cpp +++ b/src/osx/carbon/toplevel.cpp @@ -37,7 +37,7 @@ #include "wx/control.h" #endif //WX_PRECOMP -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #include "wx/tooltip.h" #include "wx/dnd.h" @@ -50,7 +50,7 @@ #endif // for targeting OSX -#include "wx/mac/private.h" +#include "wx/osx/private.h" // ============================================================================ // wxTopLevelWindowMac implementation diff --git a/src/osx/carbon/uma.cpp b/src/osx/carbon/uma.cpp index 634ea0e03f..45610c21bf 100644 --- a/src/osx/carbon/uma.cpp +++ b/src/osx/carbon/uma.cpp @@ -11,14 +11,14 @@ #include "wx/wxprec.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #if wxUSE_GUI #include "wx/toplevel.h" #include "wx/dc.h" -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" static SInt32 sUMASystemVersion = 0 ; diff --git a/src/osx/carbon/utils.cpp b/src/osx/carbon/utils.cpp index b690bac889..4192588d15 100644 --- a/src/osx/carbon/utils.cpp +++ b/src/osx/carbon/utils.cpp @@ -25,7 +25,7 @@ #include "wx/apptrait.h" #if wxUSE_GUI - #include "wx/mac/uma.h" + #include "wx/osx/uma.h" #endif #include @@ -44,11 +44,11 @@ #if wxUSE_GUI #include #include - #include "wx/mac/private/timer.h" + #include "wx/osx/private/timer.h" #endif // wxUSE_GUI #include "wx/evtloop.h" -#include "wx/mac/private.h" +#include "wx/osx/private.h" #if defined(__MWERKS__) && wxUSE_UNICODE #if __MWERKS__ < 0x4100 diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm index e2ac95f9e6..07c34d5630 100644 --- a/src/osx/carbon/utilscocoa.mm +++ b/src/osx/carbon/utilscocoa.mm @@ -14,7 +14,7 @@ #include #ifdef __WXMAC__ -#include "wx/mac/private.h" +#include "wx/osx/private.h" #endif #ifdef __WXMAC__ diff --git a/src/osx/carbon/window.cpp b/src/osx/carbon/window.cpp index 9a37721407..20619b2b08 100644 --- a/src/osx/carbon/window.cpp +++ b/src/osx/carbon/window.cpp @@ -61,7 +61,7 @@ #include "wx/dnd.h" #endif -#include "wx/mac/uma.h" +#include "wx/osx/uma.h" #define MAC_SCROLLBAR_SIZE 15 #define MAC_SMALL_SCROLLBAR_SIZE 11 -- 2.45.2