// 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"
#include "wx/msgdlg.h"
-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
// idle system
// "delete_event"
//-----------------------------------------------------------------------------
+extern "C" {
static
bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
return TRUE;
}
+}
//-----------------------------------------------------------------------------
// "clicked" for OK-button
//-----------------------------------------------------------------------------
-#ifdef __WXGTK12__
+extern "C" {
static
void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog )
{
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)
wxOK | wxICON_ERROR);
return;
}
+#endif
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
- 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.GetEncoding()));
+ dialog->SetChosenFont( fontname);
g_free( fontname );
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 )
{
event.SetEventObject( dialog );
dialog->GetEventHandler()->ProcessEvent( 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;
!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);
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( GTK_BUTTON(sel->ok_button)->child ), 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( GTK_BUTTON(sel->cancel_button)->child ), 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 );
wxFont font = m_fontData.GetInitialFont();
if( font.Ok() )
{
- wxNativeFontInfo *info = font.GetNativeFontInfo();
+ const wxNativeFontInfo *info = font.GetNativeFontInfo();
if ( info )
{
- const wxString& fontname = info->xFontName;
+
+#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
{
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
+#endif // GPE
+
projects / wxWidgets.git / blobdiff