X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9fa72bd2a637cee761c56e2ce61cec3e43c62765..c6a6bbbf637a5a580b7ab182483d27522f5e3189:/src/gtk/fontdlg.cpp diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index 6480cbe651..f6059b9e63 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/fontdlg.cpp +// Name: src/gtk/fontdlg.cpp // Purpose: wxFontDialog // Author: Robert Roebling // Id: $Id$ @@ -10,28 +10,20 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" +#if wxUSE_FONTDLG && !defined(__WXGPE__) -#if wxUSE_FONTDLG +#include "wx/fontdlg.h" -#ifndef __WXGPE__ +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/utils.h" + #include "wx/msgdlg.h" +#endif -#include "wx/fontdlg.h" #include "wx/fontutil.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/debug.h" -#include "wx/msgdlg.h" #include "wx/gtk/private.h" -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; - //----------------------------------------------------------------------------- // "delete_event" //----------------------------------------------------------------------------- @@ -40,8 +32,7 @@ extern "C" { static bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win ) { - if (g_isIdle) - wxapp_install_idle_handler(); + // don't need to install idle handler, its done from "event" signal /* printf( "OnDelete from " ); @@ -52,7 +43,7 @@ bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN win->Close(); - return TRUE; + return true; } } @@ -69,11 +60,9 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget); - gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg); + wxGtkString fontname(gtk_font_selection_dialog_get_font_name(fontdlg)); dialog->SetChosenFont( fontname); - g_free( fontname ); - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); event.SetEventObject( dialog ); dialog->GetEventHandler()->ProcessEvent( event ); @@ -105,14 +94,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) bool wxFontDialog::DoCreate(wxWindow *parent) { - m_needParent = FALSE; + m_needParent = false; if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) || !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, wxDefaultValidator, wxT("fontdialog") )) { wxFAIL_MSG( wxT("wxFontDialog creation failed") ); - return FALSE; + return false; } wxString m_message( _("Choose font") ); @@ -151,7 +140,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent) } } - return TRUE; + return true; } wxFontDialog::~wxFontDialog() @@ -163,7 +152,4 @@ void wxFontDialog::SetChosenFont(const char *fontname) m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) )); } -#endif // wxUSE_FONTDLG - -#endif // GPE - +#endif // wxUSE_FONTDLG && !__WXGPE__