X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e0201eaa1e299cb5c37246324464e6e2dce7584..c6a6bbbf637a5a580b7ab182483d27522f5e3189:/src/gtk/fontdlg.cpp?ds=sidebyside diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp index 163c546614..f6059b9e63 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlg.cpp +// Name: src/gtk/fontdlg.cpp // Purpose: wxFontDialog // Author: Robert Roebling // Id: $Id$ @@ -7,34 +7,32 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "fontdlg.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_FONTDLG && !defined(__WXGPE__) #include "wx/fontdlg.h" -#include "wx/utils.h" -#include "wx/intl.h" -#include "wx/debug.h" -#include "wx/msgdlg.h" -#include "gtk/gtk.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/utils.h" + #include "wx/msgdlg.h" +#endif -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- +#include "wx/fontutil.h" -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // "delete_event" //----------------------------------------------------------------------------- +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 " ); @@ -45,14 +43,15 @@ bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN win->Close(); - return TRUE; + return true; +} } //----------------------------------------------------------------------------- // "clicked" for OK-button //----------------------------------------------------------------------------- -#ifdef __WXGTK12__ +extern "C" { static void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog ) { @@ -60,29 +59,21 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial wxapp_install_idle_handler(); GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget); - GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg); - if (!gfont) - { - wxMessageBox(_("Please choose a valid font."), _("Error"), wxOK); - return; - } - - gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg); - wxFont font( gfont, fontname ); - g_free( fontname ); - dialog->m_fontData.SetChosenFont( font ); + wxGtkString fontname(gtk_font_selection_dialog_get_font_name(fontdlg)); + dialog->SetChosenFont( fontname); wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); event.SetEventObject( dialog ); dialog->GetEventHandler()->ProcessEvent( event ); } -#endif // GTK+ 1.2 andlater only +} //----------------------------------------------------------------------------- // "clicked" for Cancel-button //----------------------------------------------------------------------------- +extern "C" { static void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialog ) { @@ -93,54 +84,72 @@ void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo event.SetEventObject( dialog ); dialog->GetEventHandler()->ProcessEvent( event ); } +} //----------------------------------------------------------------------------- // wxFontDialog //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFontDialog,wxDialog) +IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *WXUNUSED(data) ) +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, _T("fontdialog") )) + wxDefaultValidator, wxT("fontdialog") )) { - wxFAIL_MSG( _T("wxXX creation failed") ); - return; + wxFAIL_MSG( wxT("wxFontDialog creation failed") ); + return false; } -#ifndef __WXGTK12__ - wxFAIL_MSG( _T("TODO") ); -#else // GTK+ 1.2 + wxString m_message( _("Choose font") ); - m_widget = gtk_font_selection_dialog_new( m_message.mbc_str() ); + m_widget = gtk_font_selection_dialog_new( wxGTK_CONV( m_message ) ); - int x = (gdk_screen_width () - 400) / 2; - int y = (gdk_screen_height () - 400) / 2; - gtk_widget_set_uposition( m_widget, x, y ); + if (parent) + gtk_window_set_transient_for(GTK_WINDOW(m_widget), + GTK_WINDOW(parent->m_widget)); 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); - // strange way to internationalize - gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), wxConvCurrent->cWX2MB(_("OK")) ); + g_signal_connect (sel->cancel_button, "clicked", + G_CALLBACK (gtk_fontdialog_cancel_callback), this); - gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked", - GTK_SIGNAL_FUNC(gtk_fontdialog_cancel_callback), (gpointer*)this ); + g_signal_connect (m_widget, "delete_event", + G_CALLBACK (gtk_fontdialog_delete_callback), this); - // strange way to internationalize - gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) ); + wxFont font = m_fontData.GetInitialFont(); + if( font.Ok() ) + { + const wxNativeFontInfo *info = font.GetNativeFontInfo(); + + if ( info ) + { + + const wxString& fontname = info->ToString(); + gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname)); + } + else + { + // this is not supposed to happen! + wxFAIL_MSG(_T("font is ok but no native font info?")); + } + } - gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", - GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this ); -#endif // GTK+ version + return true; } wxFontDialog::~wxFontDialog() { } +void wxFontDialog::SetChosenFont(const char *fontname) +{ + m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) )); +} + +#endif // wxUSE_FONTDLG && !__WXGPE__