From c933e267beed72a1c535c8d30ac930fc80587add Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 11 Jun 2008 19:22:25 +0000 Subject: [PATCH] fixing file paths after renaming git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/dcbase.cpp | 6 +++--- src/common/dcgraph.cpp | 6 +++++- src/common/encconv.cpp | 2 +- src/common/filefn.cpp | 10 +++------- src/common/filename.cpp | 6 +++--- src/common/intl.cpp | 4 ++-- src/common/mimecmn.cpp | 2 +- src/common/prntbase.cpp | 6 +++--- src/common/strconv.cpp | 2 +- src/common/utilscmn.cpp | 7 ++----- src/common/wxcrt.cpp | 4 ++-- 11 files changed, 26 insertions(+), 29 deletions(-) diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index 45cb64b5c6..1d0505599a 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -53,9 +53,9 @@ #endif #ifdef __WXMAC__ - #include "wx/mac/dcclient.h" - #include "wx/mac/dcmemory.h" - #include "wx/mac/dcscreen.h" + #include "wx/osx/dcclient.h" + #include "wx/osx/dcmemory.h" + #include "wx/osx/dcscreen.h" #endif #ifdef __WXPM__ diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index ee36df03b5..96516c4e52 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -31,7 +31,11 @@ #include "wx/dcclient.h" #ifdef __WXOSX__ - #include "ApplicationServices/ApplicationServices.h" +#ifdef __WXOSX_IPHONE__ + #include +#else + #include +#endif #endif //----------------------------------------------------------------------------- diff --git a/src/common/encconv.cpp b/src/common/encconv.cpp index da88c09d52..80642b96f1 100644 --- a/src/common/encconv.cpp +++ b/src/common/encconv.cpp @@ -32,7 +32,7 @@ #endif #ifdef __WXMAC__ - #include "wx/mac/corefoundation/cfstring.h" + #include "wx/osx/core/cfstring.h" #include wxUint16 gMacEncodings[wxFONTENCODING_MACMAX-wxFONTENCODING_MACMIN+1][128] ; diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index f0bfce34c2..4308af2059 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -56,7 +56,7 @@ #endif #if defined(__WXMAC__) - #include "wx/mac/private.h" // includes mac headers + #include "wx/osx/private.h" // includes mac headers #endif #ifdef __WINDOWS__ @@ -96,10 +96,6 @@ #define _MAXPATHLEN 1024 #endif -#ifdef __WXMAC__ -// # include "MoreFilesX.h" -#endif - // ---------------------------------------------------------------------------- // private globals // ---------------------------------------------------------------------------- @@ -878,7 +874,7 @@ wxString wxPathOnly (const wxString& path) // and back again - or we get nasty problems with delimiters. // Also, convert to lower case, since case is significant in UNIX. -#if defined(__WXMAC__) +#if defined(__WXMAC__) && !defined(__WXOSX_IPHONE__) #define kDefaultPathStyle kCFURLPOSIXPathStyle @@ -1661,7 +1657,7 @@ wxString wxGetOSDirectory() wxChar buf[256]; GetWindowsDirectory(buf, 256); return wxString(buf); -#elif defined(__WXMAC__) +#elif defined(__WXMAC__) && !defined(__WXOSX_IPHONE__) return wxMacFindFolder(kOnSystemDisk, 'macs', false); #else return wxEmptyString; diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 0f206a94b5..d781b78685 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -93,7 +93,7 @@ #endif #if defined(__WXMAC__) - #include "wx/mac/private.h" // includes mac headers + #include "wx/osx/private.h" // includes mac headers #endif // utime() is POSIX so should normally be available on all Unices @@ -1068,7 +1068,7 @@ wxString wxFileName::GetTempDir() // default #if defined(__DOS__) || defined(__OS2__) dir = _T("."); -#elif defined(__WXMAC__) +#elif defined(__WXMAC__) && !defined(__WXOSX_IPHONE__) dir = wxMacFindFolder(short(kOnSystemDisk), kTemporaryFolderType, kCreateFolder); #else dir = _T("/tmp"); @@ -2383,7 +2383,7 @@ wxString wxFileName::GetHumanReadableSize(const wxString &failmsg, int precision // Mac-specific functions // ---------------------------------------------------------------------------- -#ifdef __WXMAC__ +#if defined( __WXMAC__ ) && !defined( __WXOSX_IPHONE__ ) const short kMacExtensionMaxLength = 16 ; class MacDefaultExtensionRecord diff --git a/src/common/intl.cpp b/src/common/intl.cpp index 8d0f5f9891..250ee8443c 100644 --- a/src/common/intl.cpp +++ b/src/common/intl.cpp @@ -73,9 +73,9 @@ #include "wx/filesys.h" #if defined(__DARWIN__) - #include "wx/mac/corefoundation/cfref.h" + #include "wx/osx/core/cfref.h" #include - #include "wx/mac/corefoundation/cfstring.h" + #include "wx/osx/core/cfstring.h" #endif // ---------------------------------------------------------------------------- diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index 539fd7a7a8..006e1926d2 100644 --- a/src/common/mimecmn.cpp +++ b/src/common/mimecmn.cpp @@ -49,7 +49,7 @@ #if defined(__WXMSW__) #include "wx/msw/mimetype.h" #elif defined(__WXMAC__) - #include "wx/mac/mimetype.h" + #include "wx/osx/mimetype.h" #elif defined(__WXPM__) || defined (__EMX__) #include "wx/os2/mimetype.h" #undef __UNIX__ diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index 6e98cfadac..e70b4f0b4c 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -54,9 +54,9 @@ #include "wx/msw/printdlg.h" #include "wx/msw/dcprint.h" #elif defined(__WXMAC__) -#include "wx/mac/printdlg.h" -#include "wx/mac/private/print.h" -#include "wx/mac/dcprint.h" +#include "wx/osx/printdlg.h" +#include "wx/osx/private/print.h" +#include "wx/osx/dcprint.h" #elif defined(__WXPM__) #include "wx/os2/dcprint.h" #include "wx/generic/prntdlgg.h" diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 2e887046d3..507bf1307b 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -53,7 +53,7 @@ #include "wx/fontmap.h" #ifdef __DARWIN__ -#include "wx/mac/corefoundation/private/strconv_cf.h" +#include "wx/osx/core/private/strconv_cf.h" #endif //def __DARWIN__ diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 2e8c64bfe6..42d60c2c4d 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -84,10 +84,7 @@ #endif // ! __WXPALMOS5__ #ifdef __WXMAC__ -#include "wx/mac/private.h" -#ifndef __DARWIN__ -#include "InternetConfig.h" -#endif +#include "wx/osx/private.h" #endif #ifndef __WXPALMOS5__ @@ -1054,7 +1051,7 @@ bool wxLaunchDefaultBrowser(const wxString& urlOrig, int flags) // NOTE: We need to call the real implementation from src/cocoa/utils.mm // because the code must use Objective-C features. return wxCocoaLaunchDefaultBrowser(url, flags); -#elif defined(__WXMAC__) +#elif defined(__WXMAC__) && !defined(__WXOSX_IPHONE__) wxCFRef< CFURLRef > curl( CFURLCreateWithString( kCFAllocatorDefault, wxCFStringRef( url ), NULL ) ); OSStatus err = LSOpenCFURLRef( curl , NULL ); diff --git a/src/common/wxcrt.cpp b/src/common/wxcrt.cpp index 9bd6305307..5d42579e94 100644 --- a/src/common/wxcrt.cpp +++ b/src/common/wxcrt.cpp @@ -65,9 +65,9 @@ using namespace std ; #endif #if defined(__DARWIN__) - #include "wx/mac/corefoundation/cfref.h" + #include "wx/osx/core/cfref.h" #include - #include "wx/mac/corefoundation/cfstring.h" + #include "wx/osx/core/cfstring.h" #include #endif -- 2.45.2