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

Make wxCocoa compile in 64-bit mode.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2007-07-06 00:18:28 +00:00
parent f762ea32ed
commit 4799f3baab
9 changed files with 76 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/cocoa/NSView.h
View File

@@ -15,7 +15,12 @@
#include "wx/hashmap.h"
#include "wx/cocoa/ObjcAssociate.h"
#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
typedef struct CGRect NSRect;
#else
typedef struct _NSRect NSRect;
#endif
class wxWindow;
WX_DECLARE_OBJC_HASHMAP(NSView);

2
include/wx/cocoa/pen.h
View File

@@ -61,7 +61,7 @@ public:
wxBitmap *GetStipple() const;
WX_NSColor GetNSColor();
int GetCocoaLineDash(const float **pattern);
int GetCocoaLineDash(const CGFloat **pattern);
};
#endif // __WX_COCOA_PEN_H__

4
include/wx/cocoa/region.h
View File

@@ -14,7 +14,11 @@
#include "wx/generic/region.h"
#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
typedef struct CGRect NSRect;
#else
typedef struct _NSRect NSRect;
#endif
class WXDLLEXPORT wxRegion : public wxRegionGeneric
{

5
include/wx/cocoa/toolbar.h
View File

@@ -17,7 +17,12 @@
// ========================================================================
// wxToolBar
// ========================================================================
#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
typedef struct CGPoint NSPoint;
#else
typedef struct _NSPoint NSPoint;
#endif
class wxToolBarTool;
class wxToolBar : public wxToolBarBase