X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbc65e2760f79e0296c7e8b49ec6791d62070d3e..653d7a50e5d9cc02146c5c79a0cbf41e2a1f6cfb:/src/gtk1/fontdlg.cpp?ds=inline diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp index 6206f9934d..b2c47ed213 100644 --- a/src/gtk1/fontdlg.cpp +++ b/src/gtk1/fontdlg.cpp @@ -7,16 +7,21 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "fontdlg.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/defs.h" #if wxUSE_FONTDLG -#include "wx/fontutil.h" +#ifndef __WXGPE__ + #include "wx/fontdlg.h" +#include "wx/fontutil.h" #include "wx/utils.h" #include "wx/intl.h" #include "wx/debug.h" @@ -35,6 +40,7 @@ extern bool g_isIdle; // "delete_event" //----------------------------------------------------------------------------- +extern "C" { static bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win ) { @@ -52,12 +58,13 @@ bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN return TRUE; } +} //----------------------------------------------------------------------------- // "clicked" for OK-button //----------------------------------------------------------------------------- -#ifdef __WXGTK12__ +extern "C" { static void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog ) { @@ -65,6 +72,8 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial wxapp_install_idle_handler(); GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget); + +#ifndef __WXGTK20__ GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg); if (!gfont) @@ -73,10 +82,10 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial wxOK | wxICON_ERROR); return; } +#endif gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg); - - dialog->SetChosenFont(fontname); + dialog->SetChosenFont( fontname); g_free( fontname ); @@ -84,12 +93,13 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial event.SetEventObject( dialog ); dialog->GetEventHandler()->ProcessEvent( 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 ) { @@ -100,6 +110,7 @@ void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo event.SetEventObject( dialog ); dialog->GetEventHandler()->ProcessEvent( event ); } +} //----------------------------------------------------------------------------- // wxFontDialog @@ -120,25 +131,29 @@ bool wxFontDialog::DoCreate(wxWindow *parent) } 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 ); +#ifndef __WXGTK20__ // strange way to internationalize - gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->ok_button) ), wxConvCurrent->cWX2MB(_("OK")) ); + gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->ok_button) ), _("OK") ); +#endif gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked", GTK_SIGNAL_FUNC(gtk_fontdialog_cancel_callback), (gpointer*)this ); +#ifndef __WXGTK20__ // strange way to internationalize - gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->cancel_button) ), wxConvCurrent->cWX2MB(_("Cancel")) ); + gtk_label_set( GTK_LABEL( BUTTON_CHILD(sel->cancel_button) ), _("Cancel") ); +#endif gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event", GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this ); @@ -146,18 +161,19 @@ bool wxFontDialog::DoCreate(wxWindow *parent) wxFont font = m_fontData.GetInitialFont(); if( font.Ok() ) { - wxNativeFontInfo *info = font.GetNativeFontInfo(); + const wxNativeFontInfo *info = font.GetNativeFontInfo(); if ( info ) { + +#ifdef __WXGTK20__ + const wxString& fontname = info->ToString(); +#else const wxString& fontname = info->GetXFontName(); if ( !fontname ) font.GetInternalFont(); - gtk_font_selection_dialog_set_font_name - ( - sel, - wxConvCurrent->cWX2MB(fontname) - ); +#endif + gtk_font_selection_dialog_set_font_name(sel, wxGTK_CONV(fontname)); } else { @@ -175,8 +191,10 @@ wxFontDialog::~wxFontDialog() void wxFontDialog::SetChosenFont(const char *fontname) { - m_fontData.SetChosenFont(wxFont(fontname)); + m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) )); } #endif // wxUSE_FONTDLG +#endif // GPE +