Add dependency on tabmdi.h

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index 75ea3f918ada154f72e5fc9e6464d07c7f51e6f3..7766ff4e538bba84f5a801f5f9078a82071037f5 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -154,6 +154,8 @@ public:
     wxNativeFontInfo  m_info;
 };
 
     wxNativeFontInfo  m_info;
 };
 

+#define M_FONTDATA ((wxFontRefData*)m_refData)
+

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -533,10 +535,10 @@ wxSize wxFont::GetPixelSize() const
 #if wxUSE_GRAPHICS_CONTEXT
     // TODO: consider caching the value
     wxGraphicsContext* dc = wxGraphicsContext::CreateFromNative((CGContextRef) NULL);
 #if wxUSE_GRAPHICS_CONTEXT
     // TODO: consider caching the value
     wxGraphicsContext* dc = wxGraphicsContext::CreateFromNative((CGContextRef) NULL);

-    dc->SetFont(*(wxFont *)this);
+    dc->SetFont(*(wxFont *)this,*wxBLACK);

     wxDouble width, height = 0;
     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
 #else
     wxFontBase::GetPixelSize();
 #endif