Avoid CRT deprecation warnings for MSVC build using makefiles too.

[wxWidgets.git] / include / wx / gtk / control.h

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 164337796cd909cb3ed49e0b6e8aedf8631715bb..7e14b84d4bf77769e87b0d06036ab74e8e3c9af9 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        control.h
+// Name:        wx/gtk/control.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -20,7 +20,7 @@ typedef struct _GtkFrame GtkFrame;
 // C-linkage function pointer types for GetDefaultAttributesFromGTKWidget
 extern "C" {
     typedef GtkWidget* (*wxGtkWidgetNew_t)(void);
 // C-linkage function pointer types for GetDefaultAttributesFromGTKWidget
 extern "C" {
     typedef GtkWidget* (*wxGtkWidgetNew_t)(void);

-    typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const gchar*);
+    typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const char*);

     typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*);
 }
 
     typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*);
 }
 


@@ -52,7 +52,9 @@ protected:
 
     // sets the label to the given string and also sets it for the given widget
     void GTKSetLabelForLabel(GtkLabel *w, const wxString& label);
 
     // sets the label to the given string and also sets it for the given widget
     void GTKSetLabelForLabel(GtkLabel *w, const wxString& label);

+#if wxUSE_MARKUP

     void GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label);
     void GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label);

+#endif // wxUSE_MARKUP

 
     // GtkFrame helpers
     GtkWidget* GTKCreateFrame(const wxString& label);
 
     // GtkFrame helpers
     GtkWidget* GTKCreateFrame(const wxString& label);