/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/fontdlg.cpp
+// Name: src/gtk/fontdlg.cpp
// Purpose: wxFontDialog
// Author: Robert Roebling
// Id: $Id$
// 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"
//-----------------------------------------------------------------------------
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())
win->Close();
- return TRUE;
+ return true;
}
}
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);
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") );
GtkFontSelectionDialog *sel = GTK_FONT_SELECTION_DIALOG(m_widget);
- gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
- GTK_SIGNAL_FUNC(gtk_fontdialog_ok_callback), (gpointer*)this );
+ g_signal_connect (sel->ok_button, "clicked",
+ G_CALLBACK (gtk_fontdialog_ok_callback), this);
- gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
- GTK_SIGNAL_FUNC(gtk_fontdialog_cancel_callback), (gpointer*)this );
+ g_signal_connect (sel->cancel_button, "clicked",
+ G_CALLBACK (gtk_fontdialog_cancel_callback), this);
- gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
- GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
+ g_signal_connect (m_widget, "delete_event",
+ G_CALLBACK (gtk_fontdialog_delete_callback), this);
wxFont font = m_fontData.GetInitialFont();
if( font.Ok() )
}
}
- return TRUE;
+ return true;
}
wxFontDialog::~wxFontDialog()
m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) ));
}
-#endif // wxUSE_FONTDLG
-
-#endif // GPE
-
+#endif // wxUSE_FONTDLG && !__WXGPE__