X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/544229d1069a20ca4c81fac6059aa4d92d8559ef..7121be53c73b6ece3b09559e142cd7f71d1961a1:/include/wx/font.h?ds=sidebyside diff --git a/include/wx/font.h b/include/wx/font.h index dd1665ab0a..2a32af3785 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -31,6 +31,7 @@ class WXDLLEXPORT wxFontData; class WXDLLEXPORT wxFontBase; class WXDLLEXPORT wxFont; +class WXDLLEXPORT wxSize; // ---------------------------------------------------------------------------- // font constants @@ -141,7 +142,7 @@ public: int family, // see wxFontFamily enum int style, // see wxFontStyle enum int weight, // see wxFontWeight enum - bool underlined = FALSE, // not underlined by default + bool underlined = false, // not underlined by default const wxString& face = wxEmptyString, // facename wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ... @@ -225,12 +226,14 @@ private: // the currently default encoding: by default, it's the default system // encoding, but may be changed by the application using // SetDefaultEncoding() to make all subsequent fonts created without - // specifing encoding parameter using this encoding + // specifying encoding parameter using this encoding static wxFontEncoding ms_encodingDefault; }; // include the real class declaration -#if defined(__WXMSW__) +#if defined(__WXPALMOS__) + #include "wx/palmos/font.h" +#elif defined(__WXMSW__) #include "wx/msw/font.h" #elif defined(__WXMOTIF__) #include "wx/motif/font.h"