A little clarification

[wxWidgets.git] / src / gtk / fontdlg.cpp

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index b799105717c8d34387deb1772697f525c33f393c..b6117da0b0ba4594f9330e3b76f7cc4a71654534 100644 (file)
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "fontdlg.h"
 #endif
 
 #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/defs.h"
 
 #if wxUSE_FONTDLG


@@ -22,7 +25,7 @@
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 

-#include <gtk/gtk.h>
+#include "wx/gtk/private.h"

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -57,7 +60,6 @@ bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUN
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 
 // "clicked" for OK-button
 //-----------------------------------------------------------------------------
 

-#ifdef __WXGTK12__

 static
 void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog )
 {
 static
 void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dialog )
 {


@@ -65,6 +67,8 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
         wxapp_install_idle_handler();
 
     GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
         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)
     GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg);
 
     if (!gfont)


@@ -73,46 +77,10 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
                      wxOK | wxICON_ERROR);
         return;
     }
                      wxOK | wxICON_ERROR);
         return;
     }

+#endif

 
     gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
 
     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 );
 
 
     g_free( fontname );
 


@@ -120,7 +88,6 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
     event.SetEventObject( dialog );
     dialog->GetEventHandler()->ProcessEvent( event );
 }
     event.SetEventObject( dialog );
     dialog->GetEventHandler()->ProcessEvent( event );
 }

-#endif // GTK+ 1.2 and later only

 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button
 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button


@@ -141,10 +108,9 @@ void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo
 // wxFontDialog
 //-----------------------------------------------------------------------------
 
 // 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;
 


@@ -152,12 +118,12 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata )
         !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
                      wxDefaultValidator, wxT("fontdialog") ))
     {
         !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") );
     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;
 
     int x = (gdk_screen_width () - 400) / 2;
     int y = (gdk_screen_height () - 400) / 2;


@@ -168,30 +134,38 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata )
     gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_fontdialog_ok_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_fontdialog_ok_callback), (gpointer*)this );
 

+#ifndef __WXGTK20__

     // strange way to internationalize
     // 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 );
 
 
     gtk_signal_connect( GTK_OBJECT(sel->cancel_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_fontdialog_cancel_callback), (gpointer*)this );
 

+#ifndef __WXGTK20__

     // strange way to internationalize
     // 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 );
 
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
 

+#ifndef __WXGTK20__

     wxFont font = m_fontData.GetInitialFont();
     if( font.Ok() )
     {
     wxFont font = m_fontData.GetInitialFont();
     if( font.Ok() )
     {

-        wxNativeFontInfo *info = font.GetNativeFontInfo();
+        const wxNativeFontInfo *info = font.GetNativeFontInfo();

 
         if ( info )
         {
 
         if ( info )
         {

-            const wxString& fontname = info->xFontName;
+            const wxString& fontname = info->GetXFontName();

             if ( !fontname )
                 font.GetInternalFont();
             if ( !fontname )
                 font.GetInternalFont();

-            gtk_font_selection_dialog_set_font_name(sel,
-                                                    wxConvCurrent->cWX2MB(fontname));
+            gtk_font_selection_dialog_set_font_name
+            (
+                sel,
+                wxConvCurrent->cWX2MB(fontname)
+            );

         }
         else
         {
         }
         else
         {


@@ -199,11 +173,19 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata )
             wxFAIL_MSG(_T("font is ok but no native font info?"));
         }
     }
             wxFAIL_MSG(_T("font is ok but no native font info?"));
         }
     }

+#endif
+
+    return TRUE;

 }
 
 wxFontDialog::~wxFontDialog()
 {
 }
 
 }
 
 wxFontDialog::~wxFontDialog()
 {
 }
 

+void wxFontDialog::SetChosenFont(const char *fontname)
+{
+    m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) ));
+}
+

 #endif // wxUSE_FONTDLG
 
 #endif // wxUSE_FONTDLG