Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed nasty bug wxFont

Browse Source 
Removed wxDirDialog from /src/gtk


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-18 13:35:58 +00:00
parent 0659e7ee61
commit 358fc25cc3
8 changed files with 294 additions and 1312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
include/wx/gtk/font.h
View File

@@ -36,7 +36,8 @@ class wxFontNameDirectory;
// global variables
//-----------------------------------------------------------------------------
//extern wxFontNameDirectory *wxTheFontNameDirectory; // defined below
extern wxFontNameDirectory *wxTheFontNameDirectory;
extern const char* wxEmptyString;
//-----------------------------------------------------------------------------
// wxFont
@@ -46,38 +47,44 @@ class wxFont: public wxGDIObject
{
DECLARE_DYNAMIC_CLASS(wxFont)
public:
wxFont();
wxFont( int PointSize, int FontIdOrFamily, int Style, int Weight,
bool underlined = FALSE, const char *Face = ( const char *) NULL );
wxFont( int PointSize, const char *Face, int Family,
int Style, int Weight, bool underlined = FALSE );
wxFont( const wxFont& font );
~wxFont();
wxFont& operator = ( const wxFont& font );
bool operator == ( const wxFont& font );
bool operator != ( const wxFont& font );
bool Ok() const;
public:
wxFont();
wxFont( int pointSize, int family, int style, int weight, bool underlined = FALSE,
const wxString& face = wxEmptyString );
wxFont( const wxFont& font );
~wxFont();
wxFont& operator = ( const wxFont& font );
bool operator == ( const wxFont& font );
bool operator != ( const wxFont& font );
bool Ok() const;
int GetPointSize() const;
wxString GetFaceName() const;
int GetFamily() const;
wxString GetFamilyString() const;
int GetFontId() const;
wxString GetFaceString() const;
int GetStyle() const;
wxString GetStyleString() const;
int GetWeight() const;
wxString GetWeightString() const;
bool GetUnderlined() const;
wxFont( char *xFontName );
int GetPointSize() const;
int GetFamily() const;
int GetFontId() const;
int GetStyle() const;
int GetWeight() const;
bool GetUnderlined() const;
void SetPointSize( int pointSize );
void SetFamily( int family );
void SetStyle( int style );
void SetWeight( int weight );
void SetFaceName( const wxString& faceName );
void SetUnderlined( bool underlined );
wxString GetFaceName() const;
wxString GetFamilyString() const;
wxString GetStyleString() const;
wxString GetWeightString() const;
// implementation
wxFont( char *xFontName );
void Unshare();
GdkFont* GetInternalFont(float scale = 1.0) const;
GdkFont* GetInternalFont(float scale = 1.0) const;
// no data :-)
// no data :-)
};
//-----------------------------------------------------------------------------
@@ -108,6 +115,4 @@ class wxFontNameDirectory: public wxObject
int nextFontId;
};
extern wxFontNameDirectory *wxTheFontNameDirectory;
#endif // __GTKFONTH__