changed ar options to reduce build verbosity

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

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 6634bc324361a6d676adae75733a7be13ca47a70..b799105717c8d34387deb1772697f525c33f393c 100644 (file)
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fontdlg.cpp
+// Name:        gtk/fontdlg.cpp

 // Purpose:     wxFontDialog
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     wxFontDialog
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -11,13 +11,18 @@
 #pragma implementation "fontdlg.h"
 #endif
 
 #pragma implementation "fontdlg.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_FONTDLG
+
+#include "wx/fontutil.h"

 #include "wx/fontdlg.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 
 #include "wx/fontdlg.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 

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

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


@@ -64,20 +69,58 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
 
     if (!gfont)
     {
 
     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);
         return;
     }
 
     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
+    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()));
+

     g_free( fontname );
     g_free( fontname );

-    dialog->m_fontData.SetChosenFont( font );

 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
     event.SetEventObject( dialog );
     dialog->GetEventHandler()->ProcessEvent( event );
 }
 
     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
 
 //-----------------------------------------------------------------------------
 // "clicked" for Cancel-button


@@ -100,20 +143,19 @@ void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog,wxDialog)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFontDialog,wxDialog)
 

-wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *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,
 {
     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;
     }
         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() );
 
     wxString m_message( _("Choose font") );
     m_widget = gtk_font_selection_dialog_new( m_message.mbc_str() );
 


@@ -137,10 +179,31 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *data )
 
     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 );

-#endif // GTK+ version
+
+    wxFont font = m_fontData.GetInitialFont();
+    if( font.Ok() )
+    {
+        wxNativeFontInfo *info = font.GetNativeFontInfo();
+
+        if ( info )
+        {
+            const wxString& fontname = info->xFontName;
+            if ( !fontname )
+                font.GetInternalFont();
+            gtk_font_selection_dialog_set_font_name(sel,
+                                                    wxConvCurrent->cWX2MB(fontname));
+        }
+        else
+        {
+            // this is not supposed to happen!
+            wxFAIL_MSG(_T("font is ok but no native font info?"));
+        }
+    }

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

+#endif // wxUSE_FONTDLG
+