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 dae2cc4f7664c33c2c76806d6d0883267bb02dc8..9b87cafd11ec76dfc830a52c283ae3f8a5f824bf 100644
(file)
--- a/
include/wx/font.h
+++ b/
include/wx/font.h
@@
-12,10
+12,6
@@
#ifndef _WX_FONT_H_BASE_
#define _WX_FONT_H_BASE_
#ifndef _WX_FONT_H_BASE_
#define _WX_FONT_H_BASE_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "fontbase.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
@@
-28,10
+24,10
@@
// forward declarations
// ----------------------------------------------------------------------------
// forward declarations
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxFontData;
-class WXDLL
EXPORT
wxFontBase;
-class WXDLL
EXPORT
wxFont;
-class WXDLL
EXPORT
wxSize;
+class WXDLL
IMPEXP_FWD_CORE
wxFontData;
+class WXDLL
IMPEXP_FWD_CORE
wxFontBase;
+class WXDLL
IMPEXP_FWD_CORE
wxFont;
+class WXDLL
IMPEXP_FWD_CORE
wxSize;
// ----------------------------------------------------------------------------
// font constants
// ----------------------------------------------------------------------------
// font constants
@@
-109,8
+105,7
@@
enum
// wxFontBase represents a font object
// ----------------------------------------------------------------------------
// wxFontBase represents a font object
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxFontRefData;
-struct WXDLLEXPORT wxNativeFontInfo;
+class WXDLLIMPEXP_FWD_CORE wxNativeFontInfo;
class WXDLLEXPORT wxFontBase : public wxGDIObject
{
class WXDLLEXPORT wxFontBase : public wxGDIObject
{
@@
-142,7
+137,7
@@
public:
int family, // see wxFontFamily enum
int style, // see wxFontStyle enum
int weight, // see wxFontWeight enum
int family, // see wxFontFamily enum
int style, // see wxFontStyle enum
int weight, // see wxFontWeight enum
- bool underlined =
FALSE
, // not underlined by default
+ bool underlined =
false
, // not underlined by default
const wxString& face = wxEmptyString, // facename
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ...
const wxString& face = wxEmptyString, // facename
wxFontEncoding encoding = wxFONTENCODING_DEFAULT); // ISO8859-X, ...
@@
-161,7
+156,8
@@
public:
static wxFont *New(const wxString& strNativeFontDesc);
// was the font successfully created?
static wxFont *New(const wxString& strNativeFontDesc);
// was the font successfully created?
- bool Ok() const { return m_refData != NULL; }
+ bool Ok() const { return IsOk(); }
+ bool IsOk() const { return m_refData != NULL; }
// comparison
bool operator == (const wxFont& font) const;
// comparison
bool operator == (const wxFont& font) const;
@@
-190,14
+186,14
@@
public:
virtual void SetFamily( int family ) = 0;
virtual void SetStyle( int style ) = 0;
virtual void SetWeight( int weight ) = 0;
virtual void SetFamily( int family ) = 0;
virtual void SetStyle( int style ) = 0;
virtual void SetWeight( int weight ) = 0;
- virtual void SetFaceName( const wxString& faceName ) = 0;
virtual void SetUnderlined( bool underlined ) = 0;
virtual void SetEncoding(wxFontEncoding encoding) = 0;
virtual void SetUnderlined( bool underlined ) = 0;
virtual void SetEncoding(wxFontEncoding encoding) = 0;
+ virtual bool SetFaceName( const wxString& faceName );
void SetNativeFontInfo(const wxNativeFontInfo& info)
{ DoSetNativeFontInfo(info); }
void SetNativeFontInfo(const wxNativeFontInfo& info)
{ DoSetNativeFontInfo(info); }
-
void
SetNativeFontInfo(const wxString& info);
-
void
SetNativeFontInfoUserDesc(const wxString& info);
+
bool
SetNativeFontInfo(const wxString& info);
+
bool
SetNativeFontInfoUserDesc(const wxString& info);
// translate the fonts into human-readable string (i.e. GetStyleString()
// will return "wxITALIC" for an italic font, ...)
// translate the fonts into human-readable string (i.e. GetStyleString()
// will return "wxITALIC" for an italic font, ...)
@@
-215,10
+211,6
@@
public:
static void SetDefaultEncoding(wxFontEncoding encoding);
protected:
static void SetDefaultEncoding(wxFontEncoding encoding);
protected:
- // get the internal data
- wxFontRefData *GetFontData() const
- { return (wxFontRefData *)m_refData; }
-
// the function called by both overloads of SetNativeFontInfo()
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
// the function called by both overloads of SetNativeFontInfo()
virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
@@
-226,21
+218,33
@@
private:
// the currently default encoding: by default, it's the default system
// encoding, but may be changed by the application using
// SetDefaultEncoding() to make all subsequent fonts created without
// the currently default encoding: by default, it's the default system
// encoding, but may be changed by the application using
// SetDefaultEncoding() to make all subsequent fonts created without
- // specifing encoding parameter using this encoding
+ // specif
y
ing encoding parameter using this encoding
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
// include the real class declaration
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+ #include "wx/palmos/font.h"
+#elif defined(__WXMSW__)
#include "wx/msw/font.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/font.h"
#include "wx/msw/font.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/font.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK
20
__)
#include "wx/gtk/font.h"
#include "wx/gtk/font.h"
+#elif defined(__WXGTK__)
+ #include "wx/gtk1/font.h"
#elif defined(__WXX11__)
#include "wx/x11/font.h"
#elif defined(__WXMGL__)
#include "wx/mgl/font.h"
#elif defined(__WXX11__)
#include "wx/x11/font.h"
#elif defined(__WXMGL__)
#include "wx/mgl/font.h"
+#elif defined(__WXDFB__)
+ #include "wx/dfb/font.h"
#elif defined(__WXMAC__)
#include "wx/mac/font.h"
#elif defined(__WXCOCOA__)
#elif defined(__WXMAC__)
#include "wx/mac/font.h"
#elif defined(__WXCOCOA__)
@@
-249,11
+253,5
@@
private:
#include "wx/os2/font.h"
#endif
#include "wx/os2/font.h"
#endif
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-#define M_FONTDATA GetFontData()
-
#endif
// _WX_FONT_H_BASE_
#endif
// _WX_FONT_H_BASE_