Must define a symbol to test its value

[wxWidgets.git] / src / gtk / fontdlg.cpp

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 50e7ad233152a4dcd2c3bdff9bea81a4eb036dc7..f6059b9e635c42468f3b978f1ac53f3bd4cc3d2d 100644 (file)
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -16,12 +16,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/utils.h"
+    #include "wx/msgdlg.h"

 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

-#include "wx/utils.h"
-#include "wx/debug.h"
-#include "wx/msgdlg.h"

 
 #include "wx/gtk/private.h"
 
 
 #include "wx/gtk/private.h"
 


@@ -33,8 +32,7 @@ extern "C" {
 static
 bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
 {
 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 " );
 
 /*
     printf( "OnDelete from " );


@@ -62,11 +60,9 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
 
     GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
 
 
     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);
 
     dialog->SetChosenFont( fontname);
 

-    g_free( fontname );
-

     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject( dialog );
     dialog->GetEventHandler()->ProcessEvent( event );
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject( dialog );
     dialog->GetEventHandler()->ProcessEvent( event );