X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fa056ab78be920eacac56e51864fe7a45d1a31a..f944aec0cf131c1be0b8c127ba1ecdbc8410c9b2:/src/gtk1/fontdlg.cpp diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp index 1298601a79..03d12f1e9f 100644 --- a/src/gtk1/fontdlg.cpp +++ b/src/gtk1/fontdlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: fontdlg.cpp +// Name: src/gtk1/fontdlg.cpp // Purpose: wxFontDialog // Author: Robert Roebling // Id: $Id$ @@ -7,22 +7,22 @@ // 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" - -#ifdef __VMS__ -#define gtk_font_selection_dialog_get_type gtk_font_selection_dialog_get_t -#define gtk_font_selection_dialog_get_font gtk_font_selection_dialog_get_f -#define gtk_font_selection_dialog_get_font_name gtk_font_selection_dialog_getnf + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/utils.h" + #include "wx/msgdlg.h" #endif -#include + +#include "wx/fontutil.h" + +#include "wx/gtk1/private.h" //----------------------------------------------------------------------------- // idle system @@ -35,6 +35,7 @@ extern bool g_isIdle; // "delete_event" //----------------------------------------------------------------------------- +extern "C" { static bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win ) { @@ -50,14 +51,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 ) { @@ -65,67 +67,32 @@ 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); + wxMessageBox(_("Please choose a valid font."), _("Error"), + wxOK | wxICON_ERROR); return; } gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg); - - // extract the relevant bits from it - wxString xregistry, xencoding; - char *dash = strrchr(fontname, '-'); // find the last dash - if ( dash ) - { - xencoding = dash + 1; - *dash = '\0'; - dash = strrchr(fontname, '-'); // the last before one - if ( dash ) - { - xregistry = dash + 1; - } - else - { - wxFAIL_MSG( wxT("no registry in X font spec?") ); - } - - // restore the dash we changed to NUL above - *(fontname + strlen(fontname)) = '-'; - } - else - { - wxFAIL_MSG( wxT("no encoding in X font spec?") ); - } - - // transfer the X registry/encoding to wxFontData - they are used by - // wxFontMapper after wxFontDialog returns - wxFontData& fontdata = dialog->m_fontData; - - // we ignore the facename here - should be enough to choose an arbitrary - // one if the registry/encoding are specified - // dialog->m_fontData.EncodingInfo().facename = xfamily; - fontdata.EncodingInfo().xregistry = xregistry; - fontdata.EncodingInfo().xencoding = xencoding; - - // pass fontdata to wxFont ctor so that it can get the encoding from there - // if it is already known (otherwise it will try to deduce it itself) - dialog->m_fontData.SetChosenFont( wxFont(fontname, fontdata) ); + dialog->SetChosenFont( fontname); g_free( fontname ); wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); event.SetEventObject( dialog ); - dialog->GetEventHandler()->ProcessEvent( event ); + dialog->HandleWindowEvent( event ); +} } -#endif // GTK+ 1.2 and later only //----------------------------------------------------------------------------- // "clicked" for Cancel-button //----------------------------------------------------------------------------- +extern "C" { static void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialog ) { @@ -134,34 +101,34 @@ void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); event.SetEventObject( dialog ); - dialog->GetEventHandler()->ProcessEvent( event ); + dialog->HandleWindowEvent( event ); +} } //----------------------------------------------------------------------------- // wxFontDialog //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxFontDialog,wxDialog) +IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog) -wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata ) - : m_fontData(*fontdata) +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("wxXX creation failed") ); - return; + wxFAIL_MSG( wxT("wxFontDialog creation failed") ); + return false; } - + 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); @@ -169,19 +136,48 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata ) GTK_SIGNAL_FUNC(gtk_fontdialog_ok_callback), (gpointer*)this ); // strange way to internationalize - gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->ok_button)->child ), wxConvCurrent->cWX2MB(_("OK")) ); + gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->ok_button) ), _("OK") ); gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked", GTK_SIGNAL_FUNC(gtk_fontdialog_cancel_callback), (gpointer*)this ); // strange way to internationalize - gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) ); + gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->cancel_button) ), _("Cancel") ); gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this ); + + wxFont font = m_fontData.GetInitialFont(); + if( font.Ok() ) + { + const wxNativeFontInfo *info = font.GetNativeFontInfo(); + + if ( info ) + { + + const wxString& fontname = info->GetXFontName(); + if ( !fontname ) + font.GetInternalFont(); + + 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?")); + } + } + + return true; } wxFontDialog::~wxFontDialog() { } +void wxFontDialog::SetChosenFont(const char *fontname) +{ + m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) )); +} + +#endif // wxUSE_FONTDLG && !defined(__WXGPE__)