// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#ifndef __GTKCONTROLH__
#define __GTKCONTROLH__
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface
#endif
// 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 wxString &name = wxPanelNameStr );
-
- virtual void Command( wxCommandEvent &event );
+ 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);
+ }
+
+ 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);
// 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;
+ // char (the one immediately after '&') into m_chAccel (TODO 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
+ 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__