gtk 1.2.8 compilation fix

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

diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index b507f3e193b610d18361d495963161edb275fb77..1298601a79de994b22c6b726c7896c9097eb4dfd 100644 (file)
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -17,7 +17,12 @@
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 
 #include "wx/debug.h"
 #include "wx/msgdlg.h"
 

-#include "gtk/gtk.h"
+#ifdef __VMS__
+#define gtk_font_selection_dialog_get_type gtk_font_selection_dialog_get_t
+#define gtk_font_selection_dialog_get_font gtk_font_selection_dialog_get_f
+#define gtk_font_selection_dialog_get_font_name gtk_font_selection_dialog_getnf
+#endif
+#include <gtk/gtk.h>

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


@@ -84,7 +89,7 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
         }
         else
         {
         }
         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
         }
 
         // restore the dash we changed to NUL above


@@ -92,7 +97,7 @@ void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
     }
     else
     {
     }
     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
     }
 
     // transfer the X registry/encoding to wxFontData - they are used by


@@ -150,9 +155,7 @@ wxFontDialog::wxFontDialog( wxWindow *parent, wxFontData *fontdata )
         wxFAIL_MSG( wxT("wxXX creation failed") );
         return;
     }
         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() );
 
     wxString m_message( _("Choose font") );
     m_widget = gtk_font_selection_dialog_new( m_message.mbc_str() );
 


@@ -176,7 +179,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 );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
         GTK_SIGNAL_FUNC(gtk_fontdialog_delete_callback), (gpointer)this );

-#endif // GTK+ version

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