Window management and sizer layout corrections

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

diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
index c8df0749ca67ffef28ad906a272e2d80d948ec07..0fba84773103d251903ada4efee0a69ba0b3d35e 100644 (file)
--- a/include/wx/fontutil.h
+++ b/include/wx/fontutil.h
@@ -31,6 +31,33 @@
     #include "wx/msw/winundef.h"
 #endif
 
     #include "wx/msw/winundef.h"
 #endif
 

+#if defined(_WX_X_FONTLIKE)
+
+// the symbolic names for the XLFD fields (with examples for their value)
+//
+// NB: we suppose that the font always starts with the empty token (font name
+//     registry field) as we never use nor generate it anyhow
+enum wxXLFDField
+{
+    wxXLFD_FOUNDRY,     // adobe
+    wxXLFD_FAMILY,      // courier, times, ...
+    wxXLFD_WEIGHT,      // black, bold, demibold, medium, regular, light
+    wxXLFD_SLANT,       // r/i/o (roman/italique/oblique)
+    wxXLFD_SETWIDTH,    // condensed, expanded, ...
+    wxXLFD_ADDSTYLE,    // whatever - usually nothing
+    wxXLFD_PIXELSIZE,   // size in pixels
+    wxXLFD_POINTSIZE,   // size in points
+    wxXLFD_RESX,        // 72, 75, 100, ...
+    wxXLFD_RESY,
+    wxXLFD_SPACING,     // m/p/c (monospaced/proportional/character cell)
+    wxXLFD_AVGWIDTH,    // average width in 1/10 pixels
+    wxXLFD_REGISTRY,    // iso8859, rawin, koi8, ...
+    wxXLFD_ENCODING,    // 1, r, r, ...
+    wxXLFD_MAX
+};
+
+#endif // _WX_X_FONTLIKE
+

 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // types
 // ----------------------------------------------------------------------------


@@ -45,29 +72,56 @@
 //     further it might make sense to make it a real class with virtual methods
 struct WXDLLEXPORT wxNativeFontInfo
 {
 //     further it might make sense to make it a real class with virtual methods
 struct WXDLLEXPORT wxNativeFontInfo
 {

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(_WX_X_FONTLIKE)
+    // the members can't be accessed directly as we only parse the
+    // xFontName on demand
+private:

     // the components of the XLFD
     // the components of the XLFD

-    wxString     fontElements[14];
+    wxString     fontElements[wxXLFD_MAX];

 
     // the full XLFD
     wxString     xFontName;
 
 
     // the full XLFD
     wxString     xFontName;
 

+    // true until SetXFontName() is called
+    bool         m_isDefault;
+
+    // return true if we have already initialized fontElements
+    inline bool HasElements() const;
+
+public:

     // init the elements from an XLFD, return TRUE if ok
     bool FromXFontName(const wxString& xFontName);
 
     // init the elements from an XLFD, return TRUE if ok
     bool FromXFontName(const wxString& xFontName);
 

-    // generate an XLFD using the fontElements
+    // return false if we were never initialized with a valid XLFD
+    bool IsDefault() const { return m_isDefault; }
+
+    // return the XLFD (using the fontElements if necessary)

     wxString GetXFontName() const;
     wxString GetXFontName() const;

+
+    // get the given XFLD component
+    wxString GetXFontComponent(wxXLFDField field) const;
+
+    // change the font component
+    void SetXFontComponent(wxXLFDField field, const wxString& value);
+
+    // set the XFLD
+    void SetXFontName(const wxString& xFontName);

 #elif defined(__WXMSW__)
     LOGFONT      lf;
 #elif defined(__WXMSW__)
     LOGFONT      lf;

+#elif defined(__WXPM__)
+    // OS/2 native structures that define a font
+    FATTRS       fa;
+    FONTMETRICS  fm;
+    FACENAMEDESC fn;

 #else // other platforms
     //
     //  This is a generic implementation that should work on all ports
     //  without specific support by the port.
     //
 #else // other platforms
     //
     //  This is a generic implementation that should work on all ports
     //  without specific support by the port.
     //

-    #define wNO_NATIVE_FONTINFO
+    #define wxNO_NATIVE_FONTINFO

 
     int           pointSize;
 
     int           pointSize;

-    int           family;
+    wxFontFamily  family;

     wxFontStyle   style;
     wxFontWeight  weight;
     bool          underlined;
     wxFontStyle   style;
     wxFontWeight  weight;
     bool          underlined;


@@ -81,14 +135,13 @@ struct WXDLLEXPORT wxNativeFontInfo
     // reset to the default state
     void Init();
 
     // reset to the default state
     void Init();
 

-    // accessors and modifiers for the font elements: note that there is no
-    // GetFamily() because in general it is impossible to get the family for an
-    // arbitrary native font
+    // accessors and modifiers for the font elements

     int GetPointSize() const;
     wxFontStyle GetStyle() const;
     wxFontWeight GetWeight() const;
     bool GetUnderlined() const;
     wxString GetFaceName() const;
     int GetPointSize() const;
     wxFontStyle GetStyle() const;
     wxFontWeight GetWeight() const;
     bool GetUnderlined() const;
     wxString GetFaceName() const;

+    wxFontFamily GetFamily() const;

     wxFontEncoding GetEncoding() const;
 
     void SetPointSize(int pointsize);
     wxFontEncoding GetEncoding() const;
 
     void SetPointSize(int pointsize);


@@ -96,6 +149,7 @@ struct WXDLLEXPORT wxNativeFontInfo
     void SetWeight(wxFontWeight weight);
     void SetUnderlined(bool underlined);
     void SetFaceName(wxString facename);
     void SetWeight(wxFontWeight weight);
     void SetUnderlined(bool underlined);
     void SetFaceName(wxString facename);

+    void SetFamily(wxFontFamily family);

     void SetEncoding(wxFontEncoding encoding);
 
     // it is important to be able to serialize wxNativeFontInfo objects to be
     void SetEncoding(wxFontEncoding encoding);
 
     // it is important to be able to serialize wxNativeFontInfo objects to be