added missing button state

[wxWidgets.git] / wxPython / src / _font.i

diff --git a/wxPython/src/_font.i b/wxPython/src/_font.i
index 9cd36d352c19202f9f073bbbd16dec3afd0793e7..ac507526bc41b8a27e0b8c99b2a5c0f0c9f99abd 100644 (file)
--- a/wxPython/src/_font.i
+++ b/wxPython/src/_font.i
@@ -61,33 +61,26 @@ enum wxFontWeight
 enum
 {
     // no special flags: font with default weight/slant/anti-aliasing
 enum
 {
     // no special flags: font with default weight/slant/anti-aliasing

-    wxFONTFLAG_DEFAULT          = 0,
+    wxFONTFLAG_DEFAULT,

 
     // slant flags (default: no slant)
 
     // slant flags (default: no slant)

-    wxFONTFLAG_ITALIC           = 1 << 0,
-    wxFONTFLAG_SLANT            = 1 << 1,
+    wxFONTFLAG_ITALIC,
+    wxFONTFLAG_SLANT,

 
     // weight flags (default: medium)
 
     // weight flags (default: medium)

-    wxFONTFLAG_LIGHT            = 1 << 2,
-    wxFONTFLAG_BOLD             = 1 << 3,
+    wxFONTFLAG_LIGHT,
+    wxFONTFLAG_BOLD,

 
     // anti-aliasing flag: force on or off (default: the current system default)
 
     // anti-aliasing flag: force on or off (default: the current system default)

-    wxFONTFLAG_ANTIALIASED      = 1 << 4,
-    wxFONTFLAG_NOT_ANTIALIASED  = 1 << 5,
+    wxFONTFLAG_ANTIALIASED,
+    wxFONTFLAG_NOT_ANTIALIASED,

 
     // underlined/strikethrough flags (default: no lines)
 
     // underlined/strikethrough flags (default: no lines)

-    wxFONTFLAG_UNDERLINED       = 1 << 6,
-    wxFONTFLAG_STRIKETHROUGH    = 1 << 7,
+    wxFONTFLAG_UNDERLINED,
+    wxFONTFLAG_STRIKETHROUGH,

 
     // the mask of all currently used flags
 
     // the mask of all currently used flags

-    wxFONTFLAG_MASK = wxFONTFLAG_ITALIC             |
-                      wxFONTFLAG_SLANT              |
-                      wxFONTFLAG_LIGHT              |
-                      wxFONTFLAG_BOLD               |
-                      wxFONTFLAG_ANTIALIASED        |
-                      wxFONTFLAG_NOT_ANTIALIASED    |
-                      wxFONTFLAG_UNDERLINED         |
-                      wxFONTFLAG_STRIKETHROUGH
+    wxFONTFLAG_MASK

 };
 
 
 };
 
 


@@ -118,7 +111,8 @@ enum wxFontEncoding
     wxFONTENCODING_ISO8859_MAX,
 
     // Cyrillic charset soup (see http://czyborra.com/charsets/cyrillic.html)
     wxFONTENCODING_ISO8859_MAX,
 
     // Cyrillic charset soup (see http://czyborra.com/charsets/cyrillic.html)

-    wxFONTENCODING_KOI8,            // we don't support any of KOI8 variants
+    wxFONTENCODING_KOI8,            // KOI8 Russian
+    wxFONTENCODING_KOI8_U,          // KOI8 Ukrainian

     wxFONTENCODING_ALTERNATIVE,     // same as MS-DOS CP866
     wxFONTENCODING_BULGARIAN,       // used under Linux in Bulgaria
 
     wxFONTENCODING_ALTERNATIVE,     // same as MS-DOS CP866
     wxFONTENCODING_BULGARIAN,       // used under Linux in Bulgaria
 


@@ -153,6 +147,50 @@ enum wxFontEncoding
     wxFONTENCODING_UTF32BE,         // UTF-32 Big Endian Unicode encoding
     wxFONTENCODING_UTF32LE,         // UTF-32 Little Endian Unicode encoding
 
     wxFONTENCODING_UTF32BE,         // UTF-32 Big Endian Unicode encoding
     wxFONTENCODING_UTF32LE,         // UTF-32 Little Endian Unicode encoding
 

+    wxFONTENCODING_MACROMAN,        // the standard mac encodings
+    wxFONTENCODING_MACJAPANESE,
+    wxFONTENCODING_MACCHINESETRAD,
+    wxFONTENCODING_MACKOREAN,
+    wxFONTENCODING_MACARABIC,
+    wxFONTENCODING_MACHEBREW,
+    wxFONTENCODING_MACGREEK,
+    wxFONTENCODING_MACCYRILLIC,
+    wxFONTENCODING_MACDEVANAGARI,
+    wxFONTENCODING_MACGURMUKHI,
+    wxFONTENCODING_MACGUJARATI,
+    wxFONTENCODING_MACORIYA,
+    wxFONTENCODING_MACBENGALI,
+    wxFONTENCODING_MACTAMIL,
+    wxFONTENCODING_MACTELUGU,
+    wxFONTENCODING_MACKANNADA,
+    wxFONTENCODING_MACMALAJALAM,
+    wxFONTENCODING_MACSINHALESE,
+    wxFONTENCODING_MACBURMESE,
+    wxFONTENCODING_MACKHMER,
+    wxFONTENCODING_MACTHAI,
+    wxFONTENCODING_MACLAOTIAN,
+    wxFONTENCODING_MACGEORGIAN,
+    wxFONTENCODING_MACARMENIAN,
+    wxFONTENCODING_MACCHINESESIMP,
+    wxFONTENCODING_MACTIBETAN,
+    wxFONTENCODING_MACMONGOLIAN,
+    wxFONTENCODING_MACETHIOPIC,
+    wxFONTENCODING_MACCENTRALEUR,
+    wxFONTENCODING_MACVIATNAMESE,
+    wxFONTENCODING_MACARABICEXT,
+    wxFONTENCODING_MACSYMBOL,
+    wxFONTENCODING_MACDINGBATS,
+    wxFONTENCODING_MACTURKISH,
+    wxFONTENCODING_MACCROATIAN,
+    wxFONTENCODING_MACICELANDIC,
+    wxFONTENCODING_MACROMANIAN,
+    wxFONTENCODING_MACCELTIC,
+    wxFONTENCODING_MACGAELIC,
+    wxFONTENCODING_MACKEYBOARD,
+
+    wxFONTENCODING_MACMIN = wxFONTENCODING_MACROMAN ,
+    wxFONTENCODING_MACMAX = wxFONTENCODING_MACKEYBOARD ,
+

     wxFONTENCODING_MAX,             // highest enumerated encoding value
 
 
     wxFONTENCODING_MAX,             // highest enumerated encoding value
 
 


@@ -195,6 +233,9 @@ public:
 
     // accessors and modifiers for the font elements
     int GetPointSize() const;
 
     // accessors and modifiers for the font elements
     int GetPointSize() const;

+#ifdef __WXMSW__
+    wxSize GetPixelSize() const;
+#endif

     wxFontStyle GetStyle() const;
     wxFontWeight GetWeight() const;
     bool GetUnderlined() const;
     wxFontStyle GetStyle() const;
     wxFontWeight GetWeight() const;
     bool GetUnderlined() const;


@@ -203,13 +244,24 @@ public:
     wxFontEncoding GetEncoding() const;
 
     void SetPointSize(int pointsize);
     wxFontEncoding GetEncoding() const;
 
     void SetPointSize(int pointsize);

+#ifdef __WXMSW__
+    void SetPixelSize(const wxSize& pixelSize);
+#endif

     void SetStyle(wxFontStyle style);
     void SetWeight(wxFontWeight weight);
     void SetUnderlined(bool underlined);
     void SetStyle(wxFontStyle style);
     void SetWeight(wxFontWeight weight);
     void SetUnderlined(bool underlined);

-    void SetFaceName(wxString facename);
+    bool SetFaceName(wxString facename);

     void SetFamily(wxFontFamily family);
     void SetEncoding(wxFontEncoding encoding);
 
     void SetFamily(wxFontFamily family);
     void SetEncoding(wxFontEncoding encoding);
 

+// TODO:     
+//     // sets the first facename in the given array which is found
+//     // to be valid. If no valid facename is given, sets the
+//     // first valid facename returned by wxFontEnumerator::GetFacenames().
+//     // Does not return a bool since it cannot fail.
+//     void SetFaceName(const wxArrayString &facenames);
+
+    

     // it is important to be able to serialize wxNativeFontInfo objects to be
     // able to store them (in config file, for example)
     bool FromString(const wxString& s);
     // it is important to be able to serialize wxNativeFontInfo objects to be
     // able to store them (in config file, for example)
     bool FromString(const wxString& s);


@@ -226,6 +278,14 @@ public:
     // hopefully be understood by the user)
     bool FromUserString(const wxString& s);
     wxString ToUserString() const;
     // hopefully be understood by the user)
     bool FromUserString(const wxString& s);
     wxString ToUserString() const;

+    
+    %property(Encoding, GetEncoding, SetEncoding, doc="See `GetEncoding` and `SetEncoding`");
+    %property(FaceName, GetFaceName, SetFaceName, doc="See `GetFaceName` and `SetFaceName`");
+    %property(Family, GetFamily, SetFamily, doc="See `GetFamily` and `SetFamily`");
+    %property(PointSize, GetPointSize, SetPointSize, doc="See `GetPointSize` and `SetPointSize`");
+    %property(Style, GetStyle, SetStyle, doc="See `GetStyle` and `SetStyle`");
+    %property(Underlined, GetUnderlined, SetUnderlined, doc="See `GetUnderlined` and `SetUnderlined`");
+    %property(Weight, GetWeight, SetWeight, doc="See `GetWeight` and `SetWeight`");

 };
 
 
 };
 
 


@@ -238,7 +298,7 @@ struct wxNativeEncodingInfo
 
     wxNativeEncodingInfo();
     ~wxNativeEncodingInfo();
 
     wxNativeEncodingInfo();
     ~wxNativeEncodingInfo();

-    
+

     // this struct is saved in config by wxFontMapper, so it should know to
     // serialise itself (implemented in platform-specific code)
     bool FromString(const wxString& s);
     // this struct is saved in config by wxFontMapper, so it should know to
     // serialise itself (implemented in platform-specific code)
     bool FromString(const wxString& s);


@@ -261,17 +321,17 @@ struct wxNativeEncodingInfo
 %}
 
 // test for the existence of the font described by this facename/encoding,
 %}
 
 // test for the existence of the font described by this facename/encoding,

-// return TRUE if such font(s) exist, FALSE otherwise
+// return True if such font(s) exist, False otherwise

 bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
 
 #else
 
 %inline %{
     wxNativeEncodingInfo* wxGetNativeFontEncoding(wxFontEncoding encoding)
 bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
 
 #else
 
 %inline %{
     wxNativeEncodingInfo* wxGetNativeFontEncoding(wxFontEncoding encoding)

-        { PyErr_SetNone(PyExc_NotImplementedError); return NULL; }
-    
+        { wxPyRaiseNotImplemented(); return NULL; }
+

     bool wxTestFontEncoding(const wxNativeEncodingInfo& info)
     bool wxTestFontEncoding(const wxNativeEncodingInfo& info)

-        { PyErr_SetNone(PyExc_NotImplementedError); return false; }
+        { wxPyRaiseNotImplemented(); return false; }

 %}
 #endif
 
 %}
 #endif
 


@@ -284,11 +344,11 @@ bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
 // The default implementations of all functions will ask the user if they are
 // not capable of finding the answer themselves and store the answer in a
 // config file (configurable via SetConfigXXX functions). This behaviour may
 // The default implementations of all functions will ask the user if they are
 // not capable of finding the answer themselves and store the answer in a
 // config file (configurable via SetConfigXXX functions). This behaviour may

-// be disabled by giving the value of FALSE to "interactive" parameter.
+// be disabled by giving the value of False to "interactive" parameter.

 // However, the functions will always consult the config file to allow the
 // user-defined values override the default logic and there is no way to
 // disable this - which shouldn't be ever needed because if "interactive" was
 // However, the functions will always consult the config file to allow the
 // user-defined values override the default logic and there is no way to
 // disable this - which shouldn't be ever needed because if "interactive" was

-// never TRUE, the config file is never created anyhow.
+// never True, the config file is never created anyhow.

 //
 // This is a singleton class, font mapper objects can only be accessed using
 // wxFontMapper::Get().
 //
 // This is a singleton class, font mapper objects can only be accessed using
 // wxFontMapper::Get().


@@ -301,7 +361,7 @@ public:
 
     // return instance of the wxFontMapper singleton
     static wxFontMapper *Get();
 
     // return instance of the wxFontMapper singleton
     static wxFontMapper *Get();

-    // set the sigleton to 'mapper' instance and return previous one
+    // set the singleton to 'mapper' instance and return previous one

     static wxFontMapper *Set(wxFontMapper *mapper);
 
 
     static wxFontMapper *Set(wxFontMapper *mapper);
 
 


@@ -309,7 +369,7 @@ public:
     // wxFONTENCODING_SYSTEM if couldn't decode it
     //
     // interactive parameter is ignored in the base class, we behave as if it
     // wxFONTENCODING_SYSTEM if couldn't decode it
     //
     // interactive parameter is ignored in the base class, we behave as if it

-    // were always false
+    // were always False

     virtual wxFontEncoding CharsetToEncoding(const wxString& charset,
                                              bool interactive = true);
 
     virtual wxFontEncoding CharsetToEncoding(const wxString& charset,
                                              bool interactive = true);
 


@@ -320,18 +380,24 @@ public:
     // get the n-th supported encoding
     static wxFontEncoding GetEncoding(size_t n);
 
     // get the n-th supported encoding
     static wxFontEncoding GetEncoding(size_t n);
 

-    // return internal string identifier for the encoding (see also
-    // GetEncodingDescription())
+    // return canonical name of this encoding (this is a short string,
+    // GetEncodingDescription() returns a longer one)

     static wxString GetEncodingName(wxFontEncoding encoding);
 
     static wxString GetEncodingName(wxFontEncoding encoding);
 

+//     // return a list of all names of this encoding (see GetEncodingName)
+//     static const wxChar** GetAllEncodingNames(wxFontEncoding encoding);
+    

     // return user-readable string describing the given encoding
     //
     // NB: hard-coded now, but might change later (read it from config?)
     static wxString GetEncodingDescription(wxFontEncoding encoding);
 
     // return user-readable string describing the given encoding
     //
     // NB: hard-coded now, but might change later (read it from config?)
     static wxString GetEncodingDescription(wxFontEncoding encoding);
 

+    // find the encoding corresponding to the given name, inverse of
+    // GetEncodingName() and less general than CharsetToEncoding()
+    //
+    // returns wxFONTENCODING_MAX if the name is not a supported encoding
+    static wxFontEncoding GetEncodingFromName(const wxString& name);

 
 

-    // set the config object to use (may be NULL to use default)
-    void SetConfig(wxConfigBase *config);

 
     // set the root config path to use (should be an absolute path)
     void SetConfigPath(const wxString& prefix);
 
     // set the root config path to use (should be an absolute path)
     void SetConfigPath(const wxString& prefix);


@@ -347,7 +413,7 @@ public:
     %extend {
         PyObject* GetAltForEncoding(wxFontEncoding encoding,
                                     const wxString& facename = wxPyEmptyString,
     %extend {
         PyObject* GetAltForEncoding(wxFontEncoding encoding,
                                     const wxString& facename = wxPyEmptyString,

-                                    bool interactive = TRUE) {
+                                    bool interactive = true) {

             wxFontEncoding alt_enc;
             if (self->GetAltForEncoding(encoding, &alt_enc, facename, interactive))
                 return PyInt_FromLong(alt_enc);
             wxFontEncoding alt_enc;
             if (self->GetAltForEncoding(encoding, &alt_enc, facename, interactive))
                 return PyInt_FromLong(alt_enc);


@@ -360,7 +426,8 @@ public:
 
 
     // checks whether given encoding is available in given face or not.
 
 
     // checks whether given encoding is available in given face or not.

-    // If no facename is given,
+    // If no facename is given (default), return true if it's available in any
+    // facename at all.

     bool IsEncodingAvailable(wxFontEncoding encoding,
                              const wxString& facename = wxPyEmptyString);
 
     bool IsEncodingAvailable(wxFontEncoding encoding,
                              const wxString& facename = wxPyEmptyString);
 


@@ -370,6 +437,8 @@ public:
     // the title for the dialogs (note that default is quite reasonable)
     void SetDialogTitle(const wxString& title);
 
     // the title for the dialogs (note that default is quite reasonable)
     void SetDialogTitle(const wxString& title);
 

+
+     %property(AltForEncoding, GetAltForEncoding, doc="See `GetAltForEncoding`");

 };
 
 
 };
 
 


@@ -378,83 +447,393 @@ public:
 %newgroup
 
 
 %newgroup
 
 

+MustHaveApp(wxFont);
+MustHaveApp(wxFont::GetDefaultEncoding);
+MustHaveApp(wxFont::SetDefaultEncoding);
+
+DocStr(wxFont,
+"A font is an object which determines the appearance of text. Fonts are
+used for drawing text to a device context, and setting the appearance
+of a window's text.
+
+You can retrieve the current system font settings with `wx.SystemSettings`.", "
+
+The possible values for the family parameter of wx.Font constructor are:
+
+    ========================  =============================
+    wx.FONTFAMILY_DEFAULT     Chooses a default font.
+    wx.FONTFAMILY_DECORATIVE  A decorative font. 
+    wx.FONTFAMILY_ROMAN       A formal, serif font.
+    wx.FONTFAMILY_SCRIPT      A handwriting font. 
+    wx.FONTFAMILY_SWISS       A sans-serif font. 
+    wx.FONTFAMILY_MODERN      Usually a fixed pitch font.    
+    wx.FONTFAMILY_TELETYPE    A teletype font. 
+    ========================  =============================
+
+The possible values for the weight parameter are:
+
+    ====================  ==
+    wx.FONTWEIGHT_NORMAL
+    wx.FONTWEIGHT_LIGHT
+    wx.FONTWEIGHT_BOLD
+    ====================  ==
+
+The known font encodings are:
+
+    ===========================       ====================================
+    wx.FONTENCODING_SYSTEM            system default
+    wx.FONTENCODING_DEFAULT           current default encoding
+    wx.FONTENCODING_ISO8859_1         West European (Latin1)
+    wx.FONTENCODING_ISO8859_2         Central and East European (Latin2)
+    wx.FONTENCODING_ISO8859_3         Esperanto (Latin3)
+    wx.FONTENCODING_ISO8859_4         Baltic (old) (Latin4)
+    wx.FONTENCODING_ISO8859_5         Cyrillic
+    wx.FONTENCODING_ISO8859_6         Arabic
+    wx.FONTENCODING_ISO8859_7         Greek
+    wx.FONTENCODING_ISO8859_8         Hebrew
+    wx.FONTENCODING_ISO8859_9         Turkish (Latin5)
+    wx.FONTENCODING_ISO8859_10        Variation of Latin4 (Latin6)
+    wx.FONTENCODING_ISO8859_11        Thai
+    wx.FONTENCODING_ISO8859_12        doesn't exist currently, but put it
+                                      here anyhow to make all ISO8859
+                                      consecutive numbers
+    wx.FONTENCODING_ISO8859_13        Baltic (Latin7)
+    wx.FONTENCODING_ISO8859_14        Latin8
+    wx.FONTENCODING_ISO8859_15        Latin9 (a.k.a. Latin0, includes euro)
+    wx.FONTENCODING_KOI8              Cyrillic charset
+    wx.FONTENCODING_ALTERNATIVE       same as MS-DOS CP866
+    wx.FONTENCODING_BULGARIAN         used under Linux in Bulgaria
+    wx.FONTENCODING_CP437             original MS-DOS codepage
+    wx.FONTENCODING_CP850             CP437 merged with Latin1
+    wx.FONTENCODING_CP852             CP437 merged with Latin2
+    wx.FONTENCODING_CP855             another cyrillic encoding
+    wx.FONTENCODING_CP866             and another one
+    wx.FONTENCODING_CP874             WinThai
+    wx.FONTENCODING_CP1250            WinLatin2
+    wx.FONTENCODING_CP1251            WinCyrillic
+    wx.FONTENCODING_CP1252            WinLatin1
+    wx.FONTENCODING_CP1253            WinGreek (8859-7)
+    wx.FONTENCODING_CP1254            WinTurkish
+    wx.FONTENCODING_CP1255            WinHebrew
+    wx.FONTENCODING_CP1256            WinArabic
+    wx.FONTENCODING_CP1257            WinBaltic (same as Latin 7)
+    wx.FONTENCODING_UTF7              UTF-7 Unicode encoding
+    wx.FONTENCODING_UTF8              UTF-8 Unicode encoding
+    ===========================       ====================================
+
+");
+

 class wxFont : public wxGDIObject {
 public:
 class wxFont : public wxGDIObject {
 public:

-    wxFont( int pointSize, int family, int style, int weight,
-            bool underline=FALSE, const wxString& face = wxPyEmptyString,
-            wxFontEncoding encoding=wxFONTENCODING_DEFAULT);
+    %pythonPrepend wxFont   "if kwargs.has_key('faceName'): kwargs['face'] = kwargs['faceName'];del kwargs['faceName']"
+
+    DocCtorStr(
+        wxFont( int pointSize, int family, int style, int weight,
+                bool underline=false, const wxString& face = wxPyEmptyString,
+                wxFontEncoding encoding = wxFONTENCODING_DEFAULT),
+        "Creates a font object with the specified attributes.
+
+    :param pointSize:  The size of the font in points.
+
+    :param family: Font family.  A generic way of referring to fonts
+        without specifying actual facename.  It can be One of 
+        the ``wx.FONTFAMILY_xxx`` constants.
+
+    :param style: One of the ``wx.FONTSTYLE_xxx`` constants.
+
+    :param weight: Font weight, sometimes also referred to as font
+        boldness. One of the ``wx.FONTWEIGHT_xxx`` constants.
+
+    :param underline: The value can be ``True`` or ``False`` and
+        indicates whether the font will include an underline.  This
+        may not be supported on all platforms.
+
+    :param face: An optional string specifying the actual typeface to
+        be used. If it is an empty string, a default typeface will be
+        chosen based on the family.
+
+    :param encoding: An encoding which may be one of the
+        ``wx.FONTENCODING_xxx`` constants.  If the specified encoding isn't
+        available, no font is created.
+
+:see: `wx.FFont`, `wx.FontFromPixelSize`, `wx.FFontFromPixelSize`,
+    `wx.FontFromNativeInfoString`, `wx.FontFromNativeInfo`
+", "");
+

     ~wxFont();
 
     ~wxFont();
 

-    %name(FontFromNativeInfo) wxFont(const wxNativeFontInfo& info);
+    %RenameDocCtor(
+        FontFromNativeInfo,
+        "Construct a `wx.Font` from a `wx.NativeFontInfo` object.", "",
+        wxFont(const wxNativeFontInfo& info));
+    

     %extend {
     %extend {

-        %name(FontFromNativeInfoString) wxFont(const wxString& info) {
-            wxNativeFontInfo nfi;
-            nfi.FromString(info);
-            return new wxFont(nfi);
-        }
+        %RenameDocCtor(
+            FontFromNativeInfoString,
+            "Construct a `wx.Font` from the string representation of a
+`wx.NativeFontInfo` object.", "", 
+            wxFont(const wxString& info))
+            {
+                wxNativeFontInfo nfi;
+                nfi.FromString(info);
+                return new wxFont(nfi);
+            }
+    }

 
 

-        %name(Font2) wxFont(int pointSize,
-                              wxFontFamily family,
-                              int flags = wxFONTFLAG_DEFAULT,
-                              const wxString& face = wxPyEmptyString,
-                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT) {
-            return wxFont::New(pointSize, family, flags, face, encoding);
-        }
+    
+    %extend {        
+        %RenameDocCtor(
+            FFont,
+            "A bit of a simpler way to create a `wx.Font` using flags instead of
+individual attribute settings.  The value of flags can be a
+combination of the following:
+
+    ============================  ==
+    wx.FONTFLAG_DEFAULT
+    wx.FONTFLAG_ITALIC
+    wx.FONTFLAG_SLANT
+    wx.FONTFLAG_LIGHT
+    wx.FONTFLAG_BOLD
+    wx.FONTFLAG_ANTIALIASED
+    wx.FONTFLAG_NOT_ANTIALIASED
+    wx.FONTFLAG_UNDERLINED
+    wx.FONTFLAG_STRIKETHROUGH
+    ============================  ==
+
+:see: `wx.Font.__init__`", "",
+
+            wxFont(int pointSize,
+                   wxFontFamily family,
+                   int flags = wxFONTFLAG_DEFAULT,
+                   const wxString& face = wxPyEmptyString,
+                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT))
+            {
+                return wxFont::New(pointSize, family, flags, face, encoding);
+            }
+
+
+        // There is a real ctor for this on wxMSW, but not the others, so just
+        // use the factory function in all cases.
+        
+        %RenameDocCtor(
+            FontFromPixelSize,
+            "Creates a font using a size in pixels rather than points.  If there is
+platform API support for this then it is used, otherwise a font with
+the closest size is found using a binary search.
+
+:see: `wx.Font.__init__`", "", 
+            wxFont(const wxSize& pixelSize,
+                   int family,
+                   int style,
+                   int weight,
+                   bool underlined = false,
+                   const wxString& face = wxEmptyString,
+                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT))
+            {
+                return wxFontBase::New(pixelSize, family,
+                                       style, weight, underlined,
+                                       face, encoding);
+            }
+
+        %RenameDocCtor(
+            FFontFromPixelSize,
+            "Creates a font using a size in pixels rather than points.  If there is
+platform API support for this then it is used, otherwise a font with
+the closest size is found using a binary search.
+
+:see: `wx.Font.__init__`, `wx.FFont`", "",
+            wxFont(const wxSize& pixelSize,
+                   wxFontFamily family,
+                   int flags = wxFONTFLAG_DEFAULT,
+                   const wxString& face = wxEmptyString,
+                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT))
+            {
+                return wxFontBase::New(pixelSize, family, flags, face, encoding);
+            }

     }
 
     }
 

+    

 
     // was the font successfully created?
 
     // was the font successfully created?

-    bool Ok() const;
-    %pythoncode { def __nonzero__(self): return self.Ok() }
+    DocDeclStr(
+        bool , IsOk() const,
+        "Returns ``True`` if this font was successfully created.", "");    
+    %pythoncode { Ok = IsOk }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }

 
 

+    

     // comparison
     // comparison

-    bool operator == (const wxFont& font) const;
-    bool operator != (const wxFont& font) const;
+    %extend {
+        bool __eq__(const wxFont* other) { return other ? (*self == *other) : false; }
+        bool __ne__(const wxFont* other) { return other ? (*self != *other) : true;  }
+    }

 
 

-    // accessors: get the font characteristics
-    virtual int GetPointSize() const;
-    virtual int GetFamily() const;
-    virtual int GetStyle() const;
-    virtual int GetWeight() const;
-    virtual bool GetUnderlined() const;
-    virtual wxString GetFaceName() const;
-    virtual wxFontEncoding GetEncoding() const;
-    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
+    
+    DocDeclStr(
+        virtual int , GetPointSize() const,
+        "Gets the point size.", "");
+    
+    DocDeclStr(
+        virtual wxSize , GetPixelSize() const,
+        "Returns the size in pixels if the font was constructed with a pixel
+size.", "");
+    
+    DocDeclStr(
+        virtual bool , IsUsingSizeInPixels() const,
+        "Returns ``True`` if the font is using a pixelSize.", "");
+    
+    
+    DocDeclStr(
+        virtual int , GetFamily() const,
+        "Gets the font family. ", "");
+    
+    DocDeclStr(
+        virtual int , GetStyle() const,
+        "Gets the font style.", "");
+    
+    DocDeclStr(
+        virtual int , GetWeight() const,
+        "Gets the font weight. ", "");
+    
+    DocDeclStr(
+        virtual bool , GetUnderlined() const,
+        "Returns ``True`` if the font is underlined, ``False`` otherwise.", "");
+    
+    DocDeclStr(
+        virtual wxString , GetFaceName() const,
+        "Returns the typeface name associated with the font, or the empty
+string if there is no typeface information.", "");
+    
+    DocDeclStr(
+        virtual wxFontEncoding , GetEncoding() const,
+        "Get the font's encoding.", "");
+    
+    DocDeclStr(
+        virtual const wxNativeFontInfo *, GetNativeFontInfo() const,
+        "Constructs a `wx.NativeFontInfo` object from this font.", "");
+    

 
 

-    virtual bool IsFixedWidth() const;
+    DocDeclStr(
+        virtual bool , IsFixedWidth() const,
+        "Returns true if the font is a fixed width (or monospaced) font, false
+if it is a proportional one or font is invalid.", "");
+    

 
 

-    wxString GetNativeFontInfoDesc() const;
-    wxString GetNativeFontInfoUserDesc() const;
+    DocDeclStr(
+        wxString , GetNativeFontInfoDesc() const,
+        "Returns the platform-dependent string completely describing this font
+or an empty string if the font isn't valid.", "");
+    
+    DocDeclStr(
+        wxString , GetNativeFontInfoUserDesc() const,
+        "Returns a human readable version of `GetNativeFontInfoDesc`.", "");
+    

 
     // change the font characteristics
 
     // change the font characteristics

-    virtual void SetPointSize( int pointSize );
-    virtual void SetFamily( int family );
-    virtual void SetStyle( int style );
-    virtual void SetWeight( int weight );
-    virtual void SetFaceName( const wxString& faceName );
-    virtual void SetUnderlined( bool underlined );
-    virtual void SetEncoding(wxFontEncoding encoding);
-    void SetNativeFontInfo(const wxNativeFontInfo& info);
-    %name(SetNativeFontInfoFromString) void SetNativeFontInfo(const wxString& info);
-    void SetNativeFontInfoUserDesc(const wxString& info);
-
-    // translate the fonts into human-readable string (i.e. GetStyleString()
-    // will return "wxITALIC" for an italic font, ...)
-    wxString GetFamilyString() const;
-    wxString GetStyleString() const;
-    wxString GetWeightString() const;
-
-    // Unofficial API, don't use
-    virtual void SetNoAntiAliasing( bool no = TRUE );
-    virtual bool GetNoAntiAliasing();
+    DocDeclStr(
+        virtual void , SetPointSize( int pointSize ),
+        "Sets the point size.", "");
+    
+    DocDeclStr(
+        virtual void , SetPixelSize( const wxSize& pixelSize ),
+        "Sets the size in pixels rather than points.  If there is platform API
+support for this then it is used, otherwise a font with the closest
+size is found using a binary search.", "");
+    
+    DocDeclStr(
+        virtual void , SetFamily( int family ),
+        "Sets the font family.", "");
+    
+    DocDeclStr(
+        virtual void , SetStyle( int style ),
+        "Sets the font style.", "");
+    
+    DocDeclStr(
+        virtual void , SetWeight( int weight ),
+        "Sets the font weight.", "");
+    
+    DocDeclStr(
+        virtual bool , SetFaceName( const wxString& faceName ),
+        "Sets the facename for the font.  The facename, which should be a valid
+font installed on the end-user's system.
+
+To avoid portability problems, don't rely on a specific face, but
+specify the font family instead or as well. A suitable font will be
+found on the end-user's system. If both the family and the facename
+are specified, wxWidgets will first search for the specific face, and
+then for a font belonging to the same family.", "");
+    
+    DocDeclStr(
+        virtual void , SetUnderlined( bool underlined ),
+        "Sets underlining.", "");
+    
+    DocDeclStr(
+        virtual void , SetEncoding(wxFontEncoding encoding),
+        "Set the font encoding.", "");
+    
+    DocDeclStr(
+        void , SetNativeFontInfo(const wxNativeFontInfo& info),
+        "Set the font's attributes from a `wx.NativeFontInfo` object.", "");
+    
+
+    DocDeclStrName(
+        bool , SetNativeFontInfo(const wxString& info),
+        "Set the font's attributes from string representation of a
+`wx.NativeFontInfo` object.", "",
+        SetNativeFontInfoFromString);
+    
+    DocDeclStr(
+        bool , SetNativeFontInfoUserDesc(const wxString& info),
+        "Set the font's attributes from a string formerly returned from
+`GetNativeFontInfoDesc`.", "");
+    
+
+    DocDeclStr(
+        wxString , GetFamilyString() const,
+        "Returns a string representation of the font family.", "");
+    
+    DocDeclStr(
+        wxString , GetStyleString() const,
+        "Returns a string representation of the font style.", "");
+    
+    DocDeclStr(
+        wxString , GetWeightString() const,
+        "Return a string representation of the font weight.", "");
+    
+
+    virtual void SetNoAntiAliasing( bool no = true );
+    virtual bool GetNoAntiAliasing() const;

 
     // 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);
-};    
-
+    DocDeclStr(
+        static wxFontEncoding , GetDefaultEncoding(),
+        "Returns the encoding used for all fonts created with an encoding of
+``wx.FONTENCODING_DEFAULT``.", "");
+    
+    DocDeclStr(
+        static void , SetDefaultEncoding(wxFontEncoding encoding),
+        "Sets the default font encoding.", "");
+
+    %property(Encoding, GetEncoding, SetEncoding, doc="See `GetEncoding` and `SetEncoding`");
+    %property(FaceName, GetFaceName, SetFaceName, doc="See `GetFaceName` and `SetFaceName`");
+    %property(Family, GetFamily, SetFamily, doc="See `GetFamily` and `SetFamily`");
+    %property(FamilyString, GetFamilyString, doc="See `GetFamilyString`");
+    %property(NativeFontInfo, GetNativeFontInfo, SetNativeFontInfo, doc="See `GetNativeFontInfo` and `SetNativeFontInfo`");
+    %property(NativeFontInfoDesc, GetNativeFontInfoDesc, doc="See `GetNativeFontInfoDesc`");
+    %property(NativeFontInfoUserDesc, GetNativeFontInfoUserDesc, SetNativeFontInfoUserDesc, doc="See `GetNativeFontInfoUserDesc` and `SetNativeFontInfoUserDesc`");
+    %property(NoAntiAliasing, GetNoAntiAliasing, SetNoAntiAliasing, doc="See `GetNoAntiAliasing` and `SetNoAntiAliasing`");
+    %property(PixelSize, GetPixelSize, SetPixelSize, doc="See `GetPixelSize` and `SetPixelSize`");
+    %property(PointSize, GetPointSize, SetPointSize, doc="See `GetPointSize` and `SetPointSize`");
+    %property(Style, GetStyle, SetStyle, doc="See `GetStyle` and `SetStyle`");
+    %property(StyleString, GetStyleString, doc="See `GetStyleString`");
+    %property(Underlined, GetUnderlined, SetUnderlined, doc="See `GetUnderlined` and `SetUnderlined`");
+    %property(Weight, GetWeight, SetWeight, doc="See `GetWeight` and `SetWeight`");
+    %property(WeightString, GetWeightString, doc="See `GetWeightString`");
+    
+};

 
 

+%pythoncode { Font2 = wx._deprecated(FFont, "Use `wx.FFont` instead.") }

 
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup


@@ -477,33 +856,48 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
 
 %}
 
 
 %}
 

-%name(FontEnumerator) class wxPyFontEnumerator {
+MustHaveApp(wxPyFontEnumerator);
+
+%rename(FontEnumerator) wxPyFontEnumerator;
+class wxPyFontEnumerator {

 public:
 public:

-    %addtofunc wxPyFontEnumerator "self._setCallbackInfo(self, FontEnumerator, 0)"
+    %pythonAppend wxPyFontEnumerator setCallbackInfo(FontEnumerator)

 
     wxPyFontEnumerator();
     ~wxPyFontEnumerator();
 
     wxPyFontEnumerator();
     ~wxPyFontEnumerator();

-    void _setCallbackInfo(PyObject* self, PyObject* _class, bool incref);
+    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=0);

 
     bool EnumerateFacenames(
         wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all
 
     bool EnumerateFacenames(
         wxFontEncoding encoding = wxFONTENCODING_SYSTEM, // all

-        bool fixedWidthOnly = FALSE);
+        bool fixedWidthOnly = false);

 
     bool EnumerateEncodings(const wxString& facename = wxPyEmptyString);
 
 
     bool EnumerateEncodings(const wxString& facename = wxPyEmptyString);
 

-    //wxArrayString* GetEncodings();
-    //wxArrayString* GetFacenames();

     %extend {
     %extend {

-        PyObject* GetEncodings() {
-            wxArrayString* arr = self->GetEncodings();
-            return wxArrayString2PyList_helper(*arr);
+        static PyObject* GetEncodings() {
+            PyObject* ret;
+            wxArrayString arr = wxFontEnumerator::GetEncodings();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            
+            ret = wxArrayString2PyList_helper(arr);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
 
         }
 

-        PyObject* GetFacenames() {
-            wxArrayString* arr = self->GetFacenames();
-            return wxArrayString2PyList_helper(*arr);
+        static PyObject* GetFacenames() {
+            PyObject* ret;
+            wxArrayString arr = wxFontEnumerator::GetFacenames();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            
+            ret = wxArrayString2PyList_helper(arr);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
     }
         }
     }

+
+    DocDeclStr(
+        static bool , IsValidFacename(const wxString &str),
+        "Convenience function that returns true if the given face name exist in
+the user's system", "");
+    

 };
 
 
 };