decouple item index from string value (patch 1905702)

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

diff --git a/include/wx/font.h b/include/wx/font.h
index b8300fca36dc384dae25fea691080d8633a5a2f2..3b808ac2bd2309e6d2b33d498d9c20ab11f47179 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -24,10 +24,10 @@
 // forward declarations
 // ----------------------------------------------------------------------------
 
 // forward declarations
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxFontData;
-class WXDLLEXPORT wxFontBase;
-class WXDLLEXPORT wxFont;
-class WXDLLEXPORT wxSize;
+class WXDLLIMPEXP_FWD_CORE wxFontData;
+class WXDLLIMPEXP_FWD_CORE wxFontBase;
+class WXDLLIMPEXP_FWD_CORE wxFont;
+class WXDLLIMPEXP_FWD_CORE wxSize;

 
 // ----------------------------------------------------------------------------
 // font constants
 
 // ----------------------------------------------------------------------------
 // font constants


@@ -105,7 +105,7 @@ enum
 // wxFontBase represents a font object
 // ----------------------------------------------------------------------------
 
 // wxFontBase represents a font object
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxNativeFontInfo;
+class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;

 
 class WXDLLEXPORT wxFontBase : public wxGDIObject
 {
 
 class WXDLLEXPORT wxFontBase : public wxGDIObject
 {


@@ -155,13 +155,9 @@ public:
     // from the string representation of wxNativeFontInfo
     static wxFont *New(const wxString& strNativeFontDesc);
 
     // from the string representation of wxNativeFontInfo
     static wxFont *New(const wxString& strNativeFontDesc);
 

-    // was the font successfully created?
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const { return m_refData != NULL; }
-

     // comparison
     // comparison

-    bool operator == (const wxFont& font) const;
-    bool operator != (const wxFont& font) const;
+    bool operator==(const wxFont& font) const;
+    bool operator!=(const wxFont& font) const { return !(*this == font); }

 
     // accessors: get the font characteristics
     virtual int GetPointSize() const = 0;
 
     // accessors: get the font characteristics
     virtual int GetPointSize() const = 0;


@@ -222,6 +218,12 @@ private:
     static wxFontEncoding ms_encodingDefault;
 };
 
     static wxFontEncoding ms_encodingDefault;
 };
 

+// wxFontBase <-> wxString utilities, used by wxConfig
+WXDLLIMPEXP_CORE wxString wxToString(const wxFontBase& font);
+WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
+
+
+

 // include the real class declaration
 #if defined(__WXPALMOS__)
     #include "wx/palmos/font.h"
 // include the real class declaration
 #if defined(__WXPALMOS__)
     #include "wx/palmos/font.h"