compilation fix for Borland (hopefully)

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

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 98d1bedcd8c17167a61ef15e7114adb062b9e914..8a9846b1e7c38d2e50a69bca07719c4798aecf10 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


@@ -33,7 +38,7 @@ extern bool g_isIdle;
 static
 bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
 {
 static
 bool gtk_fontdialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
 {

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
 /*
         wxapp_install_idle_handler();
 
 /*


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

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
     GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
     GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg);
         wxapp_install_idle_handler();
 
     GtkFontSelectionDialog *fontdlg = GTK_FONT_SELECTION_DIALOG(dialog->m_widget);
     GdkFont *gfont = gtk_font_selection_dialog_get_font(fontdlg);

-    
+

     if (!gfont)
     {
     if (!gfont)
     {

-        wxMessageBox(_("Please choose a valid font."), _("Error"), wxOK);
+        wxMessageBox(_("Please choose a valid font."), _("Error"),
+                     wxOK | wxICON_ERROR);

         return;
     }
         return;
     }

-    
+

     gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
     gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);

-    wxFont font( gfont, fontname );
+
+    dialog->m_fontData.SetChosenFont(wxFont(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 and later only

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


@@ -84,7 +93,7 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
 static
 void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialog )
 {
 static
 void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialog )
 {

-    if (g_isIdle) 
+    if (g_isIdle)

         wxapp_install_idle_handler();
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
         wxapp_install_idle_handler();
 
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);


@@ -98,16 +107,17 @@ 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 ) ||
 {
     m_needParent = FALSE;
 
     if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||

-        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE, 
-                    wxDefaultValidator, _T("fontdialog") ))
+        !CreateBase( parent, -1, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE,
+                     wxDefaultValidator, wxT("fontdialog") ))

     {
     {

-        wxFAIL_MSG( _T("wxXX creation failed") );
-       return;
+        wxFAIL_MSG( wxT("wxXX creation failed") );
+        return;

     }
     
     wxString m_message( _("Choose font") );
     }
     
     wxString m_message( _("Choose font") );


@@ -118,7 +128,7 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *data )
     gtk_widget_set_uposition( m_widget, x, y );
 
     GtkFontSelectionDialog *sel = GTK_FONT_SELECTION_DIALOG(m_widget);
     gtk_widget_set_uposition( m_widget, x, y );
 
     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 );
 
     gtk_signal_connect( GTK_OBJECT(sel->ok_button), "clicked",
       GTK_SIGNAL_FUNC(gtk_fontdialog_ok_callback), (gpointer*)this );
 


@@ -127,15 +137,40 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *data )
 
     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 );

-      
+

     // strange way to internationalize
     gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) );
     // strange way to internationalize
     gtk_label_set( GTK_LABEL( GTK_BUTTON(sel->cancel_button)->child ), wxConvCurrent->cWX2MB(_("Cancel")) );

-    
+

     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 );

+
+    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?"));
+        }
+    }

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

+#endif // wxUSE_FONTDLG
+