A little clarification

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

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 3444d52f6a70fbfcde8e1a48b6a9e6b91462b41c..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


@@ -64,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)


@@ -72,10 +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);

-
-    dialog->SetChosenFont(fontname);
+    dialog->SetChosenFont( fontname);

 
     g_free( fontname );
 
 
     g_free( fontname );
 


@@ -145,10 +150,11 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
     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 )
         {


@@ -167,6 +173,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
             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;
 }
 
     return TRUE;
 }


@@ -177,7 +184,7 @@ wxFontDialog::~wxFontDialog()
 
 void wxFontDialog::SetChosenFont(const char *fontname)
 {
 
 void wxFontDialog::SetChosenFont(const char *fontname)
 {

-    m_fontData.SetChosenFont(wxFont(fontname));
+    m_fontData.SetChosenFont(wxFont( wxString::FromAscii(fontname) ));

 }
 
 #endif // wxUSE_FONTDLG
 }
 
 #endif // wxUSE_FONTDLG