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

Commented out Robert's SetFont change for now; changed menu handling slightly

Browse Source 
in Dialog Editor; use wxConfig now in Dialog Editor


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-09-06 16:55:57 +00:00
parent acb62b847b
commit 560b92f577
4 changed files with 78 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/window.cpp
View File

@@ -1927,7 +1927,19 @@ bool wxWindow::IsOwnGtkWindow( GdkWindow *window )
void wxWindow::SetFont( const wxFont &font )
{
m_font = font;
GtkStyle *style = (GtkStyle*) NULL;
// Unfortunately this results in a crash in GTK on deletion
// of windows, e.g. the wxStatusBar in Dialog Editor.
#if 0
// ADDED BY JACS: not sure if this is the right thing to do,
// but will avoid a segv when SetFont(wxNullFont) is called.
if (((wxFont*) &font)->Ok())
m_font = font;
else
m_font = *wxSWISS_FONT;
GtkStyle *style = (GtkStyle`*) NULL;
if (!m_hasOwnStyle)
{
m_hasOwnStyle = TRUE;
@@ -1942,6 +1954,7 @@ void wxWindow::SetFont( const wxFont &font )
style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
gtk_widget_set_style( m_widget, style );
#endif
}
wxFont *wxWindow::GetFont(void)