switching to autorelease

[wxWidgets.git] / src / mac / carbon / font.cpp

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 0a0f8a432205417619c26af5d52b2db0c74bfe7f..7766ff4e538bba84f5a801f5f9078a82071037f5 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -154,6 +154,8 @@ public:
     wxNativeFontInfo  m_info;
 };
 
+#define M_FONTDATA ((wxFontRefData*)m_refData)
+
 
 // ============================================================================
 // implementation
@@ -535,8 +537,8 @@ wxSize wxFont::GetPixelSize() const
     wxGraphicsContext* dc = wxGraphicsContext::CreateFromNative((CGContextRef) NULL);
     dc->SetFont(*(wxFont *)this,*wxBLACK);
     wxDouble width, height = 0;
-    dc->GetTextExtent( wxT("g"), &width, &height, NULL, NULL); 
-    return wxSize(width, height);
+    dc->GetTextExtent( wxT("g"), &width, &height, NULL, NULL);
+    return wxSize((int)width, (int)height);
 #else
     wxFontBase::GetPixelSize();
 #endif