AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure that the native font is initialized so the face name and such

Browse Source 
are valid


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2003-09-15 19:27:47 +00:00
parent 917d18aadb
commit 7475e81462
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/src/stc/stc.cpp
View File

@ -2037,6 +2037,11 @@ void wxStyledTextCtrl::StyleSetSpec(int styleNum, const wxString& spec) {
// Set style size, face, bold, italic, and underline attributes from // Set style size, face, bold, italic, and underline attributes from
// a wxFont's attributes. // a wxFont's attributes.
void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) { void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
#ifdef __WXGTK__
// Ensure that the native font is initialized
int x, y;
GetTextExtent(wxT("X"), &x, &y, NULL, NULL, &font);
#endif
int size = font.GetPointSize(); int size = font.GetPointSize();
wxString faceName = font.GetFaceName(); wxString faceName = font.GetFaceName();
bool bold = font.GetWeight() == wxBOLD; bool bold = font.GetWeight() == wxBOLD;

5
contrib/src/stc/stc.cpp.in
View File

@ -242,6 +242,11 @@ void wxStyledTextCtrl::StyleSetSpec(int styleNum, const wxString& spec) {
// Set style size, face, bold, italic, and underline attributes from // Set style size, face, bold, italic, and underline attributes from
// a wxFont's attributes. // a wxFont's attributes.
void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) { void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
#ifdef __WXGTK__
// Ensure that the native font is initialized
int x, y;
GetTextExtent(wxT("X"), &x, &y, NULL, NULL, &font);
#endif
int size = font.GetPointSize(); int size = font.GetPointSize();
wxString faceName = font.GetFaceName(); wxString faceName = font.GetFaceName();
bool bold = font.GetWeight() == wxBOLD; bool bold = font.GetWeight() == wxBOLD;

5
src/stc/stc.cpp
View File

@ -2037,6 +2037,11 @@ void wxStyledTextCtrl::StyleSetSpec(int styleNum, const wxString& spec) {
// Set style size, face, bold, italic, and underline attributes from // Set style size, face, bold, italic, and underline attributes from
// a wxFont's attributes. // a wxFont's attributes.
void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) { void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
#ifdef __WXGTK__
// Ensure that the native font is initialized
int x, y;
GetTextExtent(wxT("X"), &x, &y, NULL, NULL, &font);
#endif
int size = font.GetPointSize(); int size = font.GetPointSize();
wxString faceName = font.GetFaceName(); wxString faceName = font.GetFaceName();
bool bold = font.GetWeight() == wxBOLD; bool bold = font.GetWeight() == wxBOLD;

5
src/stc/stc.cpp.in
View File

@ -242,6 +242,11 @@ void wxStyledTextCtrl::StyleSetSpec(int styleNum, const wxString& spec) {
// Set style size, face, bold, italic, and underline attributes from // Set style size, face, bold, italic, and underline attributes from
// a wxFont's attributes. // a wxFont's attributes.
void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) { void wxStyledTextCtrl::StyleSetFont(int styleNum, wxFont& font) {
#ifdef __WXGTK__
// Ensure that the native font is initialized
int x, y;
GetTextExtent(wxT("X"), &x, &y, NULL, NULL, &font);
#endif
int size = font.GetPointSize(); int size = font.GetPointSize();
wxString faceName = font.GetFaceName(); wxString faceName = font.GetFaceName();
bool bold = font.GetWeight() == wxBOLD; bool bold = font.GetWeight() == wxBOLD;