X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..05e3a383e0bff29b830f91b6b40e63a3b1a3e72f:/include/wx/gtk1/control.h diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h index ad8ea7abea..17db76e571 100644 --- a/include/wx/gtk1/control.h +++ b/include/wx/gtk1/control.h @@ -2,17 +2,15 @@ // 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__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -31,21 +29,41 @@ class wxControl; // wxControl //----------------------------------------------------------------------------- -class wxControl: public wxWindow +class wxControl : public wxControlBase { - DECLARE_DYNAMIC_CLASS(wxControl) +public: + wxControl(); + wxControl(wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxControlNameStr) + { + Create(parent, id, pos, size, style, validator, name); + } - public: + bool Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxControlNameStr); - wxControl(void); - wxControl( wxWindow *parent, wxWindowID id, - const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - const long style = 0, const wxString &name = wxPanelNameStr ); - virtual void Command( wxCommandEvent &event ); + // 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: + virtual wxSize DoGetBestSize() const; +#ifdef __WXGTK20__ + wxString PrepareLabelMnemonics( const wxString &label ) const; +#endif + wxString m_label; + char m_chAccel; // enabled to avoid breaking binary compatibility later on + +private: + DECLARE_DYNAMIC_CLASS(wxControl) }; #endif // __GTKCONTROLH__