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

fix for a crash in ~wxFontList

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-12-19 13:52:57 +00:00
parent deb63b954b
commit dda88f5eee
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/font/font.cpp
View File

@@ -451,7 +451,7 @@ void MyFrame::DoResizeFont(int diff)
void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col) void MyFrame::DoChangeFont(const wxFont& font, const wxColour& col)
{ {
Resize(GetSize(), font); Resize(GetClientSize(), font);
m_canvas->SetTextFont(font); m_canvas->SetTextFont(font);
if ( col.Ok() ) if ( col.Ok() )
@@ -610,9 +610,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnSize(wxSizeEvent& event) void MyFrame::OnSize(wxSizeEvent& event)
{ {
wxSize size = event.GetSize(); Resize(GetClientSize());
Resize(size);
event.Skip(); event.Skip();
} }

2
src/gtk/font.cpp
View File

@@ -201,8 +201,6 @@ bool wxFont::Create( int pointSize,
bool wxFont::Create(const wxString& fontname, wxFontEncoding enc) bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
{ {
Init();
if( !fontname ) if( !fontname )
{ {
*this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT); *this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT);

2
src/gtk1/font.cpp
View File

@@ -201,8 +201,6 @@ bool wxFont::Create( int pointSize,
bool wxFont::Create(const wxString& fontname, wxFontEncoding enc) bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
{ {
Init();
if( !fontname ) if( !fontname )
{ {
*this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT); *this = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT);