allow specifying the mask colour in wxImage::ConvertAlphaToMask() (closes #10143)

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

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index e2243613dce52c980b8755ab45d90d5751b3dceb..3efd2d1e2c9ad86f19d31558b07d036708442df9 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,7 +26,8 @@
     #include "wx/msw/wrapwin.h"
 #endif
 
     #include "wx/msw/wrapwin.h"
 #endif
 

-struct WXDLLEXPORT wxNativeEncodingInfo;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
+struct WXDLLIMPEXP_FWD_CORE wxNativeEncodingInfo;

 
 #if defined(_WX_X_FONTLIKE)
 
 
 #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 WXDLLIMPEXP_CORE 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


@@ -110,6 +105,8 @@ public:
     // set the XFLD
     void SetXFontName(const wxString& xFontName);
 #elif defined(__WXMSW__)
     // set the XFLD
     void SetXFontName(const wxString& xFontName);
 #elif defined(__WXMSW__)

+    wxNativeFontInfo(const LOGFONT& lf_) : lf(lf_) { }
+

     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


@@ -136,9 +133,21 @@ public:
     wxNativeFontInfo() { Init(); }
 
 #if wxUSE_PANGO
     wxNativeFontInfo() { Init(); }
 
 #if wxUSE_PANGO

-    wxNativeFontInfo(const wxNativeFontInfo& info);
-    ~wxNativeFontInfo();
-#endif
+private:
+    void Init(const wxNativeFontInfo& info);
+    void Free();
+
+public:
+    wxNativeFontInfo(const wxNativeFontInfo& info) { Init(info); }
+    ~wxNativeFontInfo() { Free(); }
+
+    wxNativeFontInfo& operator=(const wxNativeFontInfo& info)
+    {
+        Free();
+        Init(info);
+        return *this;
+    }
+#endif // wxUSE_PANGO

 
     // reset to the default state
     void Init();
 
     // reset to the default state
     void Init();


@@ -150,7 +159,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());


@@ -167,6 +183,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;


@@ -175,13 +192,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);


@@ -199,14 +224,14 @@ 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)
 // attempting any substitutions)

-extern bool wxGetNativeFontEncoding(wxFontEncoding encoding,
-                                    wxNativeEncodingInfo *info);
+WXDLLIMPEXP_CORE bool wxGetNativeFontEncoding(wxFontEncoding encoding,
+                                              wxNativeEncodingInfo *info);

 
 // test for the existence of the font described by this facename/encoding,
 
 // test for the existence of the font described by this facename/encoding,

-// return TRUE if such font(s) exist, FALSE otherwise
-extern bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
+// return true if such font(s) exist, false otherwise
+WXDLLIMPEXP_CORE bool wxTestFontEncoding(const wxNativeEncodingInfo& info);

 
 // ----------------------------------------------------------------------------
 // font-related functions (X and GTK)
 
 // ----------------------------------------------------------------------------
 // font-related functions (X and GTK)


@@ -216,12 +241,4 @@ extern bool wxTestFontEncoding(const wxNativeEncodingInfo& info);
     #include "wx/unix/fontutil.h"
 #endif // X || GDK
 
     #include "wx/unix/fontutil.h"
 #endif // X || GDK
 

-// ----------------------------------------------------------------------------
-// font-related functions (MGL)
-// ----------------------------------------------------------------------------
-
-#ifdef __WXMGL__
-    #include "wx/mgl/fontutil.h"
-#endif // __WXMGL__
-

 #endif // _WX_FONTUTIL_H_
 #endif // _WX_FONTUTIL_H_