fixing file paths after renaming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -34,7 +34,7 @@
|
|||||||
#include "wx/renderer.h"
|
#include "wx/renderer.h"
|
||||||
|
|
||||||
#ifdef __WXMAC__
|
#ifdef __WXMAC__
|
||||||
#include "wx/mac/carbon/private.h"
|
#include "wx/osx/carbon/private.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/arrimpl.cpp"
|
#include "wx/arrimpl.cpp"
|
||||||
|
@@ -35,7 +35,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __WXMAC__
|
#ifdef __WXMAC__
|
||||||
#include "wx/mac/private.h"
|
#include "wx/osx/private.h"
|
||||||
#include "wx/graphics.h"
|
#include "wx/graphics.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -198,7 +198,7 @@ wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size)
|
|||||||
|
|
||||||
wxAuiDefaultDockArt::wxAuiDefaultDockArt()
|
wxAuiDefaultDockArt::wxAuiDefaultDockArt()
|
||||||
{
|
{
|
||||||
#ifdef __WXMAC__
|
#if defined( __WXMAC__ ) && !defined(__WXOSX_IPHONE__)
|
||||||
wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
|
wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
|
||||||
#else
|
#else
|
||||||
wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
|
wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
|
||||||
|
@@ -64,7 +64,7 @@ DEFINE_EVENT_TYPE(wxEVT_AUI_FIND_MANAGER)
|
|||||||
// a few defines to avoid nameclashes
|
// a few defines to avoid nameclashes
|
||||||
#define __MAC_OS_X_MEMORY_MANAGER_CLEAN__ 1
|
#define __MAC_OS_X_MEMORY_MANAGER_CLEAN__ 1
|
||||||
#define __AIFF__
|
#define __AIFF__
|
||||||
#include "wx/mac/private.h"
|
#include "wx/osx/private.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
|
Reference in New Issue
Block a user