// Name: control.h
// Purpose:
// Author: Robert Roebling
-// Created: 01/02/97
-// Id:
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Id: $Id$
+// Copyright: (c) 1998 Robert Roebling, Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#ifndef __GTKCONTROLH__
#define __GTKCONTROLH__
// wxControl
//-----------------------------------------------------------------------------
-class wxControl: public wxWindow
+class wxControl : public wxControlBase
{
- DECLARE_DYNAMIC_CLASS(wxControl)
-
- public:
-
- wxControl(void);
- 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 );
+public:
+ wxControl();
+ wxControl( wxWindow *parent,
+ wxWindowID id,
+ const wxPoint &pos = wxDefaultPosition,
+ const wxSize &size = wxDefaultSize,
+ long style = 0,
+ const wxString &name = wxPanelNameStr );
+
+ // 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(void) const;
-
+ virtual wxString GetLabel() const;
+
+protected:
wxString m_label;
+ char m_chAccel; // enabled to avoid breaking binary compatibility later on
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxControl)
};
#endif // __GTKCONTROLH__