X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..5536310df931fcbe8d2c169d1adaa9f7b26175e0:/include/wx/fontutil.h?ds=sidebyside diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h index 3e485e569a..d2491dcbc5 100644 --- a/include/wx/fontutil.h +++ b/include/wx/fontutil.h @@ -16,17 +16,13 @@ #ifndef _WX_FONTUTIL_H_ #define _WX_FONTUTIL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "fontutil.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- #include "wx/font.h" // for wxFont and wxFontEncoding -#if defined(__WXMSW__) && !defined(__PALMOS__) +#if defined(__WXMSW__) #include "wx/msw/wrapwin.h" #endif @@ -109,7 +105,7 @@ public: // set the XFLD void SetXFontName(const wxString& xFontName); -#elif defined(__WXMSW__) && !defined(__PALMOS__) +#elif defined(__WXMSW__) LOGFONT lf; #elif defined(__WXPM__) // OS/2 native structures that define a font @@ -166,7 +162,7 @@ public: if ( font.IsUsingSizeInPixels() ) SetPixelSize(font.GetPixelSize()); else - SetPointSize(font.GetPointSize()); + SetPointSize(font.GetPointSize()); #else SetPointSize(font.GetPointSize()); #endif @@ -199,7 +195,7 @@ public: void SetStyle(wxFontStyle style); void SetWeight(wxFontWeight weight); void SetUnderlined(bool underlined); - void SetFaceName(wxString facename); + void SetFaceName(const wxString& facename); void SetFamily(wxFontFamily family); void SetEncoding(wxFontEncoding encoding);