more warning fixes about empty if statement in helper classes in release build

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

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index 56099b4758553bee6b08d20a6999be382419cad7..e07b2eafe8d2b0c640ecec13a4f9576145669d52 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -16,10 +16,6 @@
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -30,6 +26,7 @@
     #include "wx/msw/wrapwin.h"
 #endif
 
     #include "wx/msw/wrapwin.h"
 #endif
 

+class WXDLLIMPEXP_BASE wxArrayString;

 struct WXDLLEXPORT wxNativeEncodingInfo;
 
 #if defined(_WX_X_FONTLIKE)
 struct WXDLLEXPORT wxNativeEncodingInfo;
 
 #if defined(_WX_X_FONTLIKE)


@@ -68,11 +65,9 @@ enum wxXLFDField
 // functions, the user code can only get the objects of this type from
 // somewhere and pass it somewhere else (possibly save them somewhere using
 // ToString() and restore them using FromString())
 // functions, the user code can only get the objects of this type from
 // somewhere and pass it somewhere else (possibly save them somewhere using
 // ToString() and restore them using FromString())

-//
-// NB: it is a POD currently for max efficiency but if it continues to grow
-//     further it might make sense to make it a real class with virtual methods
-struct WXDLLEXPORT wxNativeFontInfo
+class WXDLLEXPORT wxNativeFontInfo

 {
 {

+public:

 #if wxUSE_PANGO
     PangoFontDescription *description;
 #elif defined(_WX_X_FONTLIKE)
 #if wxUSE_PANGO
     PangoFontDescription *description;
 #elif defined(_WX_X_FONTLIKE)


@@ -92,7 +87,7 @@ private:
     inline bool HasElements() const;
 
 public:
     inline bool HasElements() const;
 
 public:

-    // init the elements from an XLFD, return TRUE if ok
+    // init the elements from an XLFD, return true if ok

     bool FromXFontName(const wxString& xFontName);
 
     // return false if we were never initialized with a valid XLFD
     bool FromXFontName(const wxString& xFontName);
 
     // return false if we were never initialized with a valid XLFD


@@ -162,7 +157,14 @@ public:
         SetStyle((wxFontStyle)font.GetStyle());
         SetWeight((wxFontWeight)font.GetWeight());
         SetUnderlined(font.GetUnderlined());
         SetStyle((wxFontStyle)font.GetStyle());
         SetWeight((wxFontWeight)font.GetWeight());
         SetUnderlined(font.GetUnderlined());

+#if defined(__WXMSW__)
+        if ( font.IsUsingSizeInPixels() )
+            SetPixelSize(font.GetPixelSize());
+        else
+            SetPointSize(font.GetPointSize());
+#else

         SetPointSize(font.GetPointSize());
         SetPointSize(font.GetPointSize());

+#endif

 
         // set the family/facename
         SetFamily((wxFontFamily)font.GetFamily());
 
         // set the family/facename
         SetFamily((wxFontFamily)font.GetFamily());


@@ -179,6 +181,7 @@ public:
 
     // accessors and modifiers for the font elements
     int GetPointSize() const;
 
     // accessors and modifiers for the font elements
     int GetPointSize() const;

+    wxSize GetPixelSize() const;

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


@@ -187,13 +190,21 @@ public:
     wxFontEncoding GetEncoding() const;
 
     void SetPointSize(int pointsize);
     wxFontEncoding GetEncoding() const;
 
     void SetPointSize(int pointsize);

+    void SetPixelSize(const wxSize& pixelSize);

     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(const wxString& facename);

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

+    // 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);


@@ -211,13 +222,13 @@ public:
 // ----------------------------------------------------------------------------
 
 // translate a wxFontEncoding into native encoding parameter (defined above),
 // ----------------------------------------------------------------------------
 
 // translate a wxFontEncoding into native encoding parameter (defined above),

-// returning TRUE if an (exact) macth could be found, FALSE otherwise (without
+// returning true if an (exact) macth could be found, false otherwise (without

 // attempting any substitutions)
 extern bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                                     wxNativeEncodingInfo *info);
 
 // test for the existence of the font described by this facename/encoding,
 // attempting any substitutions)
 extern bool wxGetNativeFontEncoding(wxFontEncoding encoding,
                                     wxNativeEncodingInfo *info);
 
 // 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

 extern bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
 
 // ----------------------------------------------------------------------------
 extern bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
 
 // ----------------------------------------------------------------------------