wxURI/wxURL links in changes list.

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

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index 56099b4758553bee6b08d20a6999be382419cad7..3e485e569a413694aaf75ee47adb87cde32f25b7 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -26,7 +26,7 @@
 
 #include "wx/font.h"        // for wxFont and wxFontEncoding
 
 
 #include "wx/font.h"        // for wxFont and wxFontEncoding
 

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

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


@@ -92,7 +92,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


@@ -109,7 +109,7 @@ public:
 
     // set the XFLD
     void SetXFontName(const wxString& xFontName);
 
     // set the XFLD
     void SetXFontName(const wxString& xFontName);

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

     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


@@ -162,7 +162,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());
         SetPointSize(font.GetPointSize());

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

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


@@ -179,6 +186,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,6 +195,7 @@ 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);


@@ -211,13 +220,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);
 
 // ----------------------------------------------------------------------------