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

removing dependancy on mac headers from public wx headers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-01-06 15:38:43 +00:00
parent 192e6679f6
commit dea106e532
2 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/cmndata.h
View File

@@ -21,13 +21,6 @@
#include "wx/colour.h" #include "wx/colour.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#if defined(__WXMAC__) && defined(TARGET_CARBON) && !defined(__UNIX__)
#if PM_USE_SESSION_APIS
#include <PMCore.h>
#endif
#include <PMApplication.h>
#endif
#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT #if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
class WXDLLEXPORT wxPrintSetupData; class WXDLLEXPORT wxPrintSetupData;
#endif #endif
@@ -190,16 +183,12 @@ class WXDLLEXPORT wxPrintData: public wxObject
#endif #endif
public: public:
#ifdef __WXMSW__ #if defined(__WXMSW__)
void* m_devMode; void* m_devMode;
void* m_devNames; void* m_devNames;
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#if TARGET_CARBON
void* m_macPageFormat ; void* m_macPageFormat ;
void* m_macPrintSettings ; void* m_macPrintSettings ;
#else
void* m_macPrintInfo ;
#endif
#endif #endif
private: private:

14
include/wx/platform.h
View File

@@ -137,18 +137,6 @@
#define __HPUX__ #define __HPUX__
#endif /* HP-UX */ #endif /* HP-UX */
#if defined(__WXMAC__) && defined(__DARWIN__)
/* Mac OS X */
/*
Some code has been added to workaround defects(?) in the
bundled gcc compiler. These corrections are identified by:
__DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif)
*/
#include <Carbon/Carbon.h>
#endif /* __WXMAC__ && __DARWIN__ */
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
#if !defined(wxSIZE_T_IS_UINT) #if !defined(wxSIZE_T_IS_UINT)
#define wxSIZE_T_IS_UINT #define wxSIZE_T_IS_UINT
@@ -167,8 +155,6 @@
bundled gcc compiler. These corrections are identified by: bundled gcc compiler. These corrections are identified by:
__DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif) __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif)
*/ */
#include <Carbon/Carbon.h>
#elif defined(__OS2__) #elif defined(__OS2__)
#if defined(__IBMCPP__) #if defined(__IBMCPP__)
#define __VISAGEAVER__ __IBMCPP__ #define __VISAGEAVER__ __IBMCPP__