wxLongLongWx::Assign(double) works - thanks Guillermo

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

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index d7d7b12cc80f13b69df3531fd0a86bd03102be4e..a5df9049a20fa3b8ea2d01e50130f4fd920d1a42 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -18,9 +18,7 @@
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)

-#endif

 
 
 
 
 
 


@@ -149,6 +147,15 @@ bool wxFont::RealizeResource()
     return TRUE;
 }
 
     return TRUE;
 }
 

+void wxFont::SetEncoding(wxFontEncoding encoding)
+{
+    Unshare();
+
+    M_FONTDATA->m_encoding = encoding;
+
+    RealizeResource();
+}
+

 void wxFont::Unshare()
 {
        // Don't change shared data
 void wxFont::Unshare()
 {
        // Don't change shared data


@@ -232,11 +239,6 @@ int wxFont::GetFamily() const
     return M_FONTDATA->m_family;
 }
 
     return M_FONTDATA->m_family;
 }
 

-int wxFont::GetFontId() const
-{
-    return M_FONTDATA->m_fontId;
-}
-

 int wxFont::GetStyle() const
 {
     return M_FONTDATA->m_style;
 int wxFont::GetStyle() const
 {
     return M_FONTDATA->m_style;