LP64 additions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mac/carbon/font.h

@@ -51,7 +51,7 @@ public:
     bool Create(const wxNativeFontInfo& info);
 
     bool MacCreateThemeFont( wxUint16 themeFontID ) ;
-    
+
     virtual ~wxFont();
 
     // implement base class pure virtuals
@@ -84,19 +84,24 @@ public:
 
     // Mac-specific, risks to change, don't use in portable code
     
+#ifndef __LP64__    
     // 'old' Quickdraw accessors
-    
     short MacGetFontNum() const;
     short MacGetFontSize() const;
     wxByte  MacGetFontStyle() const;
-    
+
     // 'new' ATSUI accessors
-    
     wxUint32 MacGetATSUFontID() const;
     wxUint32 MacGetATSUAdditionalQDStyles() const;
     wxUint16 MacGetThemeFontID() const ;
+
     // Returns an ATSUStyle not ATSUStyle*
     void* MacGetATSUStyle() const ; 
+#else
+    const void * MacGetCTFont() const;
+    // soon to be removed for 64bit, Returns an ATSUStyle not ATSUStyle*
+    void* MacGetATSUStyle() const ; 
+#endif
     
 protected:
     void Unshare();

include/wx/mac/carbon/private.h

@@ -1227,7 +1227,11 @@ public:
 
     // returns a Pict from the bitmap content
     PicHandle     GetPictHandle();
+#ifdef __LP64__
+    CGContextRef  GetHBITMAP(CGContextRef * mask = NULL ) const;
+#else
     GWorldPtr     GetHBITMAP(GWorldPtr * mask = NULL ) const;
+#endif
     void          UpdateAlphaMask() const;
 
 private :
@@ -1247,10 +1251,15 @@ private :
 #endif
     IconRef       m_iconRef;
     PicHandle     m_pictHandle;
-    GWorldPtr     m_hBitmap;
-    GWorldPtr     m_hMaskBitmap;
     wxMemoryBuffer m_maskMemBuf;
     int            m_maskBytesPerRow;
+#ifdef __LP64__
+    CGContextRef  m_hBitmap;
+    CGContextRef  m_hMaskBitmap;
+#else
+    GWorldPtr     m_hBitmap;
+    GWorldPtr     m_hMaskBitmap;
+#endif
 };
 
 class WXDLLEXPORT wxIconRefData : public wxGDIRefData