#include "wx/debug.h"
#include "wx/msgdlg.h"
-#include "gtk/gtk.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
+#endif
+#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// idle system
}
gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
- wxFont font( gfont, fontname );
+
+ // 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) );
+
g_free( fontname );
- dialog->m_fontData.SetChosenFont( font );
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
event.SetEventObject( dialog );
dialog->GetEventHandler()->ProcessEvent( event );
}
-#endif // GTK+ 1.2 andlater only
+#endif // GTK+ 1.2 and later only
//-----------------------------------------------------------------------------
// "clicked" for Cancel-button
IMPLEMENT_DYNAMIC_CLASS(wxFontDialog,wxDialog)
-wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *WXUNUSED(data) )
+wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata )
+ : m_fontData(*fontdata)
{
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") );
+ wxFAIL_MSG( wxT("wxXX creation failed") );
return;
}
-#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() );
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
-#endif // GTK+ version
}
wxFontDialog::~wxFontDialog()