mac cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
4f7d425f60
commit
8361bffa4a
2 changed files with 6 additions and 5 deletions
|
|
@ -183,8 +183,6 @@ protected:
|
|||
#include "wx/msw/apptbase.h"
|
||||
#elif defined(__UNIX__) && !defined(__EMX__)
|
||||
#include "wx/unix/apptbase.h"
|
||||
#elif defined(__WXMAC__)
|
||||
#include "wx/mac/apptbase.h"
|
||||
#elif defined(__OS2__)
|
||||
#include "wx/os2/apptbase.h"
|
||||
#else // no platform-specific methods to add to wxAppTraits
|
||||
|
|
@ -300,8 +298,6 @@ public:
|
|||
#include "wx/os2/apptrait.h"
|
||||
#elif defined(__UNIX__)
|
||||
#include "wx/unix/apptrait.h"
|
||||
#elif defined(__WXMAC__)
|
||||
#include "wx/mac/apptrait.h"
|
||||
#elif defined(__DOS__)
|
||||
#include "wx/msdos/apptrait.h"
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -2534,11 +2534,16 @@ typedef struct __CFString * CFMutableStringRef;
|
|||
|
||||
typedef struct __CFRunLoopSource * CFRunLoopSourceRef;
|
||||
|
||||
typedef struct CGColor *CGColorRef;
|
||||
#define DECLARE_WXMAC_OPAQUE_CGREF( name ) typedef struct name* name##Ref;
|
||||
|
||||
DECLARE_WXMAC_OPAQUE_CGREF( CGColor );
|
||||
DECLARE_WXMAC_OPAQUE_CGREF( CGImage );
|
||||
DECLARE_WXMAC_OPAQUE_CGREF( CGContext );
|
||||
|
||||
#define DECLARE_WXMAC_OPAQUE_REF( name ) typedef struct Opaque##name* name;
|
||||
|
||||
DECLARE_WXMAC_OPAQUE_REF( PasteboardRef );
|
||||
DECLARE_WXMAC_OPAQUE_REF( IconRef );
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue