reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/font.h b/include/wx/font.h
index f324d115c9402b8ebb7970ebaf6fff31e41f2fc9..7ca50d5dbbb2398d09e131983a70a10381b4157b 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -36,7 +36,10 @@ class WXDLLEXPORT wxFont;
 // font constants
 // ----------------------------------------------------------------------------
 
 // font constants
 // ----------------------------------------------------------------------------
 

-// standard font families
+// standard font families: these may be used only for the font creation, it
+// doesn't make sense to query an existing font for its font family as,
+// especially if the font had been created from a native font description, it
+// may be unknown

 enum wxFontFamily
 {
     wxFONTFAMILY_DEFAULT = wxDEFAULT,
 enum wxFontFamily
 {
     wxFONTFAMILY_DEFAULT = wxDEFAULT,


@@ -46,7 +49,8 @@ enum wxFontFamily
     wxFONTFAMILY_SWISS = wxSWISS,
     wxFONTFAMILY_MODERN = wxMODERN,
     wxFONTFAMILY_TELETYPE = wxTELETYPE,
     wxFONTFAMILY_SWISS = wxSWISS,
     wxFONTFAMILY_MODERN = wxMODERN,
     wxFONTFAMILY_TELETYPE = wxTELETYPE,

-    wxFONTFAMILY_MAX
+    wxFONTFAMILY_MAX,
+    wxFONTFAMILY_UNKNOWN = wxFONTFAMILY_MAX

 };
 
 // font styles
 };
 
 // font styles


@@ -78,9 +82,7 @@ class WXDLLEXPORT wxFontBase : public wxGDIObject
 {
 public:
     // creator function
 {
 public:
     // creator function

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

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


@@ -115,6 +117,8 @@ public:
     virtual wxFontEncoding GetEncoding() const = 0;
     virtual wxNativeFontInfo *GetNativeFontInfo() const;
 
     virtual wxFontEncoding GetEncoding() const = 0;
     virtual wxNativeFontInfo *GetNativeFontInfo() const;
 

+    virtual bool IsFixedWidth() const;
+

     wxString GetNativeFontInfoDesc() const;
     wxString GetNativeFontInfoUserDesc() const;
 
     wxString GetNativeFontInfoDesc() const;
     wxString GetNativeFontInfoUserDesc() const;
 


@@ -139,10 +143,8 @@ public:
 
     // the default encoding is used for creating all fonts with default
     // encoding parameter
 
     // the default encoding is used for creating all fonts with default
     // encoding parameter

-    static wxFontEncoding GetDefaultEncoding()
-        { return ms_encodingDefault; }
-    static void SetDefaultEncoding(wxFontEncoding encoding)
-        { ms_encodingDefault = encoding; }
+    static wxFontEncoding GetDefaultEncoding() { return ms_encodingDefault; }
+    static void SetDefaultEncoding(wxFontEncoding encoding);

 
 protected:
     // get the internal data
 
 protected:
     // get the internal data


@@ -164,6 +166,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(__WXX11__)
+    #include "wx/x11/font.h"

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