fixing file paths after renaming

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

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 6ee896da22fce56e4e4a1c4dad0b84fa5fa9c78f..30409be22fa7e485d1c3dafa36420d6d792e0a9a 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -34,7 +34,7 @@
 #include "wx/renderer.h"
 
 #ifdef __WXMAC__
-#include "wx/mac/carbon/private.h"
+#include "wx/osx/carbon/private.h"
 #endif
 
 #include "wx/arrimpl.cpp"

diff --git a/src/aui/dockart.cpp b/src/aui/dockart.cpp
index 02a0c7403590710689003557718c4e86882f8ac5..817eb01aaf73972dfd025c17423a4bfd52e1fb7e 100644 (file)
--- a/src/aui/dockart.cpp
+++ b/src/aui/dockart.cpp
@@ -35,7 +35,7 @@
 #endif
 
 #ifdef __WXMAC__
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 #include "wx/graphics.h"
 #endif
 
@@ -198,7 +198,7 @@ wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size)
 
 wxAuiDefaultDockArt::wxAuiDefaultDockArt()
 {
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)
     wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
 #else
     wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 9d221c17f1cb8e8ca24299ac3c499f965d2a0925..3c0b35a969c6f6d0f2f199ad12433a5815409ae5 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -64,7 +64,7 @@ DEFINE_EVENT_TYPE(wxEVT_AUI_FIND_MANAGER)
     // a few defines to avoid nameclashes
     #define __MAC_OS_X_MEMORY_MANAGER_CLEAN__ 1
     #define __AIFF__
-    #include "wx/mac/private.h"
+    #include "wx/osx/private.h"
 #endif
 
 #ifdef __WXMSW__