X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..831faf970a05e1710eac5663fd252da12a36992d:/include/wx/univ/control.h diff --git a/include/wx/univ/control.h b/include/wx/univ/control.h index 710e6307fd..2c88bbe682 100644 --- a/include/wx/univ/control.h +++ b/include/wx/univ/control.h @@ -12,10 +12,6 @@ #ifndef _WX_UNIV_CONTROL_H_ #define _WX_UNIV_CONTROL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "control.h" -#endif - class WXDLLEXPORT wxControlRenderer; class WXDLLEXPORT wxInputHandler; class WXDLLEXPORT wxRenderer; @@ -68,13 +64,15 @@ public: // this function will filter out '&' characters and will put the // accelerator char (the one immediately after '&') into m_chAccel - virtual void SetLabel(const wxString &label); - virtual wxString GetLabel() const; + virtual void SetLabel(const wxString& label); + + // return the current label + virtual wxString GetLabel() const { return m_label; } // wxUniversal-specific methods // return the accel index in the string or -1 if none and puts the modified - // string intosecond parameter if non NULL + // string into second parameter if non NULL static int FindAccelIndex(const wxString& label, wxString *labelOnly = NULL); @@ -84,7 +82,7 @@ public: // return the accel char itself or 0 if none wxChar GetAccelChar() const { - return m_indexAccel == -1 ? _T('\0') : m_label[m_indexAccel]; + return m_indexAccel == -1 ? _T('\0') : (wxChar)m_label[m_indexAccel]; } virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; } @@ -93,6 +91,11 @@ protected: // common part of all ctors void Init(); + // set m_label and m_indexAccel and refresh the control to show the new + // label (but, unlike SetLabel(), don't call the base class SetLabel() thus + // avoiding to change wxControlBase::m_labelOrig) + void UnivDoSetLabel(const wxString& label); + private: // label and accel info wxString m_label;