Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

[wxWidgets.git] / include / wx / font.h

diff --git a/include/wx/font.h b/include/wx/font.h
index fe9632599cefe0d8fde6f9766a69656e7a4f5ba1..1aad6d9172ffb80e4495f80385d862ac14611f60 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -72,12 +72,15 @@ enum wxFontWeight
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxFontRefData;
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxFontRefData;

-class WXDLLEXPORT wxNativeFontInfo;
+struct WXDLLEXPORT wxNativeFontInfo;

 
 class WXDLLEXPORT wxFontBase : public wxGDIObject
 {
 public:
     // creator function
 
 class WXDLLEXPORT wxFontBase : public wxGDIObject
 {
 public:
     // creator function

+#ifdef __DARWIN__
+    virtual ~wxFontBase() { }
+#endif

 
     // from the font components
     static wxFont *New(
 
     // from the font components
     static wxFont *New(


@@ -158,6 +161,8 @@ private:
     #include "wx/motif/font.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/font.h"
     #include "wx/motif/font.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/font.h"

+#elif defined(__WXMGL__)
+    #include "wx/mgl/font.h"

 #elif defined(__WXQT__)
     #include "wx/qt/font.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXQT__)
     #include "wx/qt/font.h"
 #elif defined(__WXMAC__)