Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OSX two-level header fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-07-24 13:28:52 +00:00
parent 37b2afb258
commit 40ba2f3bcd
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/appbase.cpp
View File

@@ -57,11 +57,8 @@
#endif #endif
#if defined(__WXMAC__) #if defined(__WXMAC__)
// VZ: MacTypes.h is enough under Mac OS X (where I could test it) but
// I don't know which headers are needed under earlier systems so
// include everything when in doubt
#ifdef __DARWIN__ #ifdef __DARWIN__
#include "MacTypes.h" #include <CoreServices/CoreServices.h>
#else #else
#include "wx/mac/private.h" // includes mac headers #include "wx/mac/private.h" // includes mac headers
#endif #endif

11
src/common/encconv.cpp
View File

@@ -36,10 +36,13 @@
#endif #endif
#ifdef __WXMAC__ #ifdef __WXMAC__
#include <ATSUnicode.h> #ifdef __DARWIN__
#include <TextCommon.h> #include <Carbon/Carbon.h>
#include <TextEncodingConverter.h> #else
#include <ATSUnicode.h>
#include <TextCommon.h>
#include <TextEncodingConverter.h>
#endif
#include "wx/fontutil.h" #include "wx/fontutil.h"
#include "wx/mac/private.h" // includes mac headers #include "wx/mac/private.h" // includes mac headers

2
src/common/strconv.cpp
View File

@@ -75,9 +75,11 @@
#include "wx/utils.h" #include "wx/utils.h"
#ifdef __WXMAC__ #ifdef __WXMAC__
#ifndef __DARWIN__
#include <ATSUnicode.h> #include <ATSUnicode.h>
#include <TextCommon.h> #include <TextCommon.h>
#include <TextEncodingConverter.h> #include <TextEncodingConverter.h>
#endif
#include "wx/mac/private.h" // includes mac headers #include "wx/mac/private.h" // includes mac headers
#endif #endif