X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ef94bfc25eb21f1d3fa93b3d55c5a1ca18d8e62..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/gtk1/control.h?ds=sidebyside

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index a579a27492..8815a7e69e 100644
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -19,7 +19,7 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxControl;
+class WXDLLIMPEXP_FWD_CORE wxControl;
 
 typedef struct _GtkLabel GtkLabel;
 typedef struct _GtkFrame GtkFrame;
@@ -31,7 +31,7 @@ typedef struct _GtkFrame GtkFrame;
 // 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*);
 }
 
@@ -72,12 +72,6 @@ protected:
     // remove mnemonics ("&"s) from the label
     static wxString GTKRemoveMnemonics(const wxString& label);
 
-    // converts wx label to GTK+ label, i.e. basically replace "&"s with "_"s
-    //
-    // for GTK+ 1 (which doesn't support mnemonics) this is the same as
-    // GTKRemoveMnemonics()
-    static wxString GTKConvertMnemonics(const wxString &label);
-
     // These are used by GetDefaultAttributes
     static wxVisualAttributes
         GetDefaultAttributesFromGTKWidget(GtkWidget* widget,