From 2a4f4a27732a6d8deb8b006c73cca9d7105fe92c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 23 Jul 1998 16:05:14 +0000 Subject: [PATCH] GetLabel() added git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/control.h | 29 +++++++++++++++++++---------- include/wx/gtk1/control.h | 29 +++++++++++++++++++---------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index a40bbf3aae..5aa8a1b39a 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -33,19 +33,28 @@ class wxControl; class wxControl: public wxWindow { - DECLARE_DYNAMIC_CLASS(wxControl) +DECLARE_DYNAMIC_CLASS(wxControl) - public: - - wxControl(void); - wxControl( wxWindow *parent, wxWindowID id, +public: + // construction + 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; + + // overridables + virtual void Command( wxCommandEvent &event ); + + // accessors + // 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; + // when we implement keyboard interface we will make use of this, but not yet + //char m_chAccel; }; #endif // __GTKCONTROLH__ diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h index a40bbf3aae..5aa8a1b39a 100644 --- a/include/wx/gtk1/control.h +++ b/include/wx/gtk1/control.h @@ -33,19 +33,28 @@ class wxControl; class wxControl: public wxWindow { - DECLARE_DYNAMIC_CLASS(wxControl) +DECLARE_DYNAMIC_CLASS(wxControl) - public: - - wxControl(void); - wxControl( wxWindow *parent, wxWindowID id, +public: + // construction + 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; + + // overridables + virtual void Command( wxCommandEvent &event ); + + // accessors + // 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; + // when we implement keyboard interface we will make use of this, but not yet + //char m_chAccel; }; #endif // __GTKCONTROLH__ -- 2.45.2