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

osx regrouping

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-07-29 20:22:57 +00:00
parent 052e5ec5f3
commit ac9e3f1f1c
9 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/defs.h
View File

@@ -2662,8 +2662,10 @@ typedef unsigned long WXDWORD;
typedef unsigned short WXWORD;
typedef WX_OPAQUE_TYPE(PicHandle ) * WXHMETAFILE ;
#if wxOSX_USE_CARBON
typedef WX_OPAQUE_TYPE(ControlRef ) * WXWidget ;
typedef WX_OPAQUE_TYPE(WindowRef) * WXWindow ;
#endif
typedef void* WXDisplay;
@@ -2800,15 +2802,33 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSTextStorage);
DECLARE_WXCOCOA_OBJC_CLASS(NSThread);
DECLARE_WXCOCOA_OBJC_CLASS(NSWindow);
DECLARE_WXCOCOA_OBJC_CLASS(NSView);
#ifdef __WXMAC__
// things added for __WXMAC__
DECLARE_WXCOCOA_OBJC_CLASS(NSString);
#else
// things only for __WXCOCOA__
#ifndef __WXMAC__
typedef WX_NSView WXWidget; /* wxWidgets BASE definition */
#endif
#endif /* __WXCOCOA__ || ( __WXMAC__ &__DARWIN__)*/
#ifdef __WXMAC__
DECLARE_WXCOCOA_OBJC_CLASS(NSString);
#if wxOSX_USE_COCOA
typedef WX_NSWindow WXWindow;
typedef WX_NSView WXWidget;
#elif wxOSX_USE_IPHONE
DECLARE_WXCOCOA_OBJC_CLASS(UIWindow);
DECLARE_WXCOCOA_OBJC_CLASS(UIView);
DECLARE_WXCOCOA_OBJC_CLASS(UIFont);
typedef WX_UIWindow WXWindow;
typedef WX_UIView WXWidget;
#endif
#endif // __WXMAC__
#if defined(__WXPALMOS__)
typedef void * WXHWND;