X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..eba0e4d417e4a57204abd04daa22919d4e2d5053:/include/wx/gtk1/control.h diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h index a40bbf3aae..d3a164d275 100644 --- a/include/wx/gtk1/control.h +++ b/include/wx/gtk1/control.h @@ -2,13 +2,11 @@ // Name: control.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling, Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKCONTROLH__ #define __GTKCONTROLH__ @@ -33,19 +31,25 @@ class wxControl; class wxControl: public wxWindow { - DECLARE_DYNAMIC_CLASS(wxControl) - - public: +DECLARE_DYNAMIC_CLASS(wxControl) - wxControl(void); - wxControl( wxWindow *parent, wxWindowID id, +public: + wxControl(); + wxControl( wxWindow *parent, wxWindowID id, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = 0, const wxString &name = wxPanelNameStr ); - virtual void Command( wxCommandEvent &event ); - virtual void SetLabel( const wxString &label ); - virtual wxString GetLabel(void) const; - - wxString m_label; + + virtual void Command( wxCommandEvent &event ); + + // this function will filter out '&' characters and will put the accelerator + // char (the one immediately after '&') into m_chAccel (@@ not yet) + virtual void SetLabel( const wxString &label ); + virtual wxString GetLabel() const; + +protected: + wxString m_label; + char m_chAccel; // enabled to avoid breaking binary compatibility later on + }; #endif // __GTKCONTROLH__