fix printf() argument type in GetOsInfo()

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

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index 6e51a1116ffc7cfcc1af4e35fd5d1df10b93d495..3fdfa9b8dbb7f9d6a4bbb7178ee6b4f4a4cbd5dd 100644 (file)
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.h
+// Name:        wx/gtk1/control.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -21,6 +21,9 @@
 
 class WXDLLIMPEXP_CORE wxControl;
 
+typedef struct _GtkLabel GtkLabel;
+typedef struct _GtkFrame GtkFrame;
+
 //-----------------------------------------------------------------------------
 // wxControl
 //-----------------------------------------------------------------------------
@@ -51,20 +54,23 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxControlNameStr);
 
-    // this function will filter out '&' characters and will put the accelerator
-    // char (the one immediately after '&') into m_chAccel (TODO not yet)
     virtual void SetLabel( const wxString &label );
     virtual wxString GetLabel() const;
-    
+
     virtual wxVisualAttributes GetDefaultAttributes() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
     void PostCreation(const wxSize& size);
 
-#ifdef __WXGTK20__
-    wxString PrepareLabelMnemonics( const wxString &label ) const;
-#endif
+    // sets the label to the given string and also sets it for the given widget
+    void GTKSetLabelForLabel(GtkLabel *w, const wxString& label);
+
+    // as GTKSetLabelForLabel() but for a GtkFrame widget
+    void GTKSetLabelForFrame(GtkFrame *w, const wxString& label);
+
+    // remove mnemonics ("&"s) from the label
+    static wxString GTKRemoveMnemonics(const wxString& label);
 
     // These are used by GetDefaultAttributes
     static wxVisualAttributes
@@ -89,8 +95,8 @@ protected:
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return false; }
 
-    wxString   m_label;
-    char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
+    // this field contains the label in wx format, i.e. with "&" mnemonics
+    wxString m_label;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxControl)