iconv() really never set the trailing 0.

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

diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index a7808d8ba0b666a49a4c7291c77e05d376150916..4582a5c0022fbdaa5ebd77da726096c963615d9d 100644 (file)
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/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 "wx/gtk/private.h"

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


@@ -52,7 +57,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 )
 {


@@ -64,20 +68,23 @@ 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 );
+    
+    // printf( "font %s\n", fontname );
+
+    dialog->SetChosenFont(fontname);
+

     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

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


@@ -98,24 +105,22 @@ 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 *WXUNUSED(data) )
+bool wxFontDialog::DoCreate(wxWindow *parent)

 {
     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") );
-        return;
+        wxFAIL_MSG( wxT("wxFontDialog creation failed") );
+        return FALSE;

     }
     }

-#ifndef __WXGTK12__
-    wxFAIL_MSG( T("TODO") );
-#else // GTK+ 1.2
+

     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;


@@ -126,21 +131,58 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *WXUNUSED(data) )
     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 );

-#endif // GTK+ version
+
+#ifndef __WXGTK20__
+    wxFont font = m_fontData.GetInitialFont();
+    if( font.Ok() )
+    {
+        wxNativeFontInfo *info = font.GetNativeFontInfo();
+
+        if ( info )
+        {
+            const wxString& fontname = info->GetXFontName();
+            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?"));
+        }
+    }
+#endif
+
+    return TRUE;

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

+void wxFontDialog::SetChosenFont(const char *fontname)
+{
+    m_fontData.SetChosenFont(wxFont(fontname));
+}
+
+#endif // wxUSE_FONTDLG
+