X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..844ca09641ffb2ec5773738d830ca46533ffeda8:/src/gtk/fontdlg.cpp

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 3dfb008131..df4b0eae8a 100644
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -7,14 +7,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "fontdlg.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/defs.h"
 
 #if wxUSE_FONTDLG
 
+#ifndef __WXGPE__
+
 #include "wx/fontutil.h"
 #include "wx/fontdlg.h"
 #include "wx/utils.h"
@@ -64,6 +69,8 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
         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)
@@ -72,11 +79,9 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
                      wxOK | wxICON_ERROR);
         return;
     }
+#endif
 
     gchar *fontname = gtk_font_selection_dialog_get_font_name(fontdlg);
-    
-    // printf( "font %s\n", fontname );
-
     dialog->SetChosenFont( fontname);
 
     g_free( fontname );
@@ -151,7 +156,7 @@ bool wxFontDialog::DoCreate(wxWindow *parent)
     wxFont font = m_fontData.GetInitialFont();
     if( font.Ok() )
     {
-        wxNativeFontInfo *info = font.GetNativeFontInfo();
+        const wxNativeFontInfo *info = font.GetNativeFontInfo();
 
         if ( info )
         {
@@ -186,3 +191,5 @@ void wxFontDialog::SetChosenFont(const char *fontname)
 
 #endif // wxUSE_FONTDLG
 
+#endif // GPE
+