If we used 10% less inline functions in useless occasions,
we would have 50% less to debug. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,12 +20,6 @@
|
||||
#include "wx/hash.h"
|
||||
#include "wx/gdiobj.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// conditional compilation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#define wxUSE_FONTNAMEDIRECTORY 0
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// classes
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -36,20 +30,12 @@ class wxWindow;
|
||||
|
||||
class wxFont;
|
||||
|
||||
#if wxUSE_FONTNAMEDIRECTORY
|
||||
class wxFontNameDirectory;
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// global variables
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
extern const wxChar* wxEmptyString;
|
||||
|
||||
#if wxUSE_FONTNAMEDIRECTORY
|
||||
extern wxFontNameDirectory *wxTheFontNameDirectory;
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFont
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -120,36 +106,4 @@ private:
|
||||
DECLARE_DYNAMIC_CLASS(wxFont)
|
||||
};
|
||||
|
||||
#if wxUSE_FONTNAMEDIRECTORY
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxFontDirectory
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class wxFontNameDirectory: public wxObject
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxFontNameDirectory)
|
||||
|
||||
public:
|
||||
wxFontNameDirectory();
|
||||
~wxFontNameDirectory();
|
||||
|
||||
void Initialize();
|
||||
void Initialize(int fontid, int family, const char *name);
|
||||
|
||||
int FindOrCreateFontId(const char *name, int family);
|
||||
char* GetAFMName(int fontid, int weight, int style);
|
||||
int GetFamily(int fontid);
|
||||
int GetFontId(const char *name);
|
||||
char* GetFontName(int fontid);
|
||||
int GetNewFontId();
|
||||
char* GetPostScriptName(int fontid, int weight, int style);
|
||||
char* GetScreenName(int fontid, int weight, int style);
|
||||
|
||||
class wxHashTable *table;
|
||||
int nextFontId;
|
||||
};
|
||||
|
||||
#endif // wxUSE_FONTNAMEDIRECTORY
|
||||
|
||||
#endif // __GTKFONTH__
|
||||
|
Reference in New Issue
Block a user