From d20db50158506335c9354ce396db2a44a5714529 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 12 Jun 2008 12:42:59 +0000 Subject: [PATCH] fixing file paths after renaming git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/aui/auibook.cpp | 2 +- src/aui/dockart.cpp | 4 ++-- src/aui/framemanager.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index 6ee896da22..30409be22f 100644 --- 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 02a0c74035..817eb01aaf 100644 --- 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 9d221c17f1..3c0b35a969 100644 --- 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__ -- 2.45.2