X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7beba2fc73283f5b750227459da57e66bcd475f5..d1c8aaa3ee8e2051ebd20042b7e59a511c276ca2:/src/gtk/fontdlg.cpp

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index b507f3e193..0cd7791011 100644
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -17,7 +17,7 @@
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -84,7 +84,7 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
         }
         else
         {
-            wxFAIL_MSG(_T("no registry in X font spec?"));
+            wxFAIL_MSG( wxT("no registry in X font spec?") );
         }
 
         // restore the dash we changed to NUL above
@@ -92,7 +92,7 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
     }
     else
     {
-        wxFAIL_MSG(_T("no encoding in X font spec?"));
+        wxFAIL_MSG( wxT("no encoding in X font spec?") );
     }
 
     // transfer the X registry/encoding to wxFontData - they are used by
@@ -150,9 +150,7 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata )
         wxFAIL_MSG( wxT("wxXX creation failed") );
         return;
     }
-#ifndef __WXGTK12__
-    wxFAIL_MSG( wxT("TODO") );
-#else // GTK+ 1.2
+    
     wxString m_message( _("Choose font") );
     m_widget = gtk_font_selection_dialog_new( m_message.mbc_str() );
 
@@ -176,7 +174,6 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata )
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );
-#endif // GTK+ version
 }
 
 wxFontDialog::~wxFontDialog()