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

Upported minor fix for font dialog.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2003-04-24 14:35:29 +00:00
parent b41f79f59d
commit 6e7d0063bc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/fontdlg.cpp
View File

@@ -64,6 +64,8 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
wxapp_install_idle_handler(); wxapp_install_idle_handler();
GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget); GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
#ifndef __WXGTK20__
GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg); GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg);
if (!gfont) if (!gfont)
@@ -72,11 +74,9 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
wxOK | wxICON_ERROR); wxOK | wxICON_ERROR);
return; return;
} }
#endif
gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg); gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
// printf( "font %s\n", fontname );
dialog->SetChosenFont( fontname); dialog->SetChosenFont( fontname);
g_free( fontname ); g_free( fontname );

6
src/gtk1/fontdlg.cpp
View File

@@ -64,6 +64,8 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
wxapp_install_idle_handler(); wxapp_install_idle_handler();
GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget); GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
#ifndef __WXGTK20__
GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg); GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg);
if (!gfont) if (!gfont)
@@ -72,11 +74,9 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
wxOK | wxICON_ERROR); wxOK | wxICON_ERROR);
return; return;
} }
#endif
gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg); gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
// printf( "font %s\n", fontname );
dialog->SetChosenFont( fontname); dialog->SetChosenFont( fontname);
g_free( fontname ); g_free( fontname );