projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add HDF_SORTUP/DOWN definitions
[wxWidgets.git]
/
include
/
wx
/
font.h
diff --git
a/include/wx/font.h
b/include/wx/font.h
index 4011aea3712a415d90071ca2c178a362e56c5a68..9b87cafd11ec76dfc830a52c283ae3f8a5f824bf 100644
(file)
--- a/
include/wx/font.h
+++ b/
include/wx/font.h
@@
-24,9
+24,10
@@
// forward declarations
// ----------------------------------------------------------------------------
// forward declarations
// ----------------------------------------------------------------------------
-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
@@
-104,8
+105,7
@@
enum
// wxFontBase represents a font object
// ----------------------------------------------------------------------------
// wxFontBase represents a font object
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxFontRefData;
-class WXDLLEXPORT wxNativeFontInfo;
+class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;
class WXDLLEXPORT wxFontBase : public wxGDIObject
{
class WXDLLEXPORT wxFontBase : public wxGDIObject
{
@@
-222,6
+222,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"