#ifndef WX_PRECOMP
#include "wx/intl.h"
+ #include "wx/utils.h"
+ #include "wx/msgdlg.h"
#endif
#include "wx/fontutil.h"
-#include "wx/utils.h"
-#include "wx/debug.h"
-#include "wx/msgdlg.h"
#include "wx/gtk/private.h"
static
bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
/*
printf( "OnDelete from " );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
static
void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog )
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
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 );
+ dialog->HandleWindowEvent( event );
}
}
static
void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialog )
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
event.SetEventObject( dialog );
- dialog->GetEventHandler()->ProcessEvent( event );
+ dialog->HandleWindowEvent( event );
}
}
bool wxFontDialog::DoCreate(wxWindow *parent)
{
- m_needParent = false;
+ parent = GetParentForModalDialog(parent, 0);
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
!CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
wxString m_message( _("Choose font") );
m_widget = gtk_font_selection_dialog_new( wxGTK_CONV( m_message ) );
+ g_object_ref(m_widget);
if (parent)
gtk_window_set_transient_for(GTK_WINDOW(m_widget),
else
{
// this is not supposed to happen!
- wxFAIL_MSG(_T("font is ok but no native font info?"));
+ wxFAIL_MSG(wxT("font is ok but no native font info?"));
}
}
void wxFontDialog::SetChosenFont(const char *fontname)
{
- m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) ));
+ m_fontData.SetChosenFont(wxFont( wxString::FromUTF8(fontname) ));
}
#endif // wxUSE_FONTDLG && !__WXGPE__