Test commit to verify cvs speed.

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

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index 3e485e569a413694aaf75ee47adb87cde32f25b7..d2491dcbc534c154f8cd20bb8d7c1910385355f9 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -16,17 +16,13 @@
 #ifndef _WX_FONTUTIL_H_
 #define _WX_FONTUTIL_H_
 
 #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
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 #include "wx/font.h"        // for wxFont and wxFontEncoding
 

-#if defined(__WXMSW__) && !defined(__PALMOS__)
+#if defined(__WXMSW__)

     #include "wx/msw/wrapwin.h"
 #endif
 
     #include "wx/msw/wrapwin.h"
 #endif
 


@@ -109,7 +105,7 @@ public:
 
     // set the XFLD
     void SetXFontName(const wxString& xFontName);
 
     // 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
     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
         if ( font.IsUsingSizeInPixels() )
             SetPixelSize(font.GetPixelSize());
         else

-        SetPointSize(font.GetPointSize());
+            SetPointSize(font.GetPointSize());

 #else
         SetPointSize(font.GetPointSize());
 #endif
 #else
         SetPointSize(font.GetPointSize());
 #endif


@@ -199,7 +195,7 @@ public:
     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);
+    void SetFaceName(const wxString& facename);

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