wxControl child of wxControlBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
#define wxControlNameStr _T("control")
|
||||
|
||||
// General item class
|
||||
class WXDLLEXPORT wxControl: public wxWindow
|
||||
class WXDLLEXPORT wxControl: public wxControlBase
|
||||
{
|
||||
DECLARE_ABSTRACT_CLASS(wxControl)
|
||||
|
||||
@@ -35,7 +35,16 @@ public:
|
||||
const wxSize &size = wxDefaultSize,
|
||||
long style = 0,
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString &name = wxControlNameStr );
|
||||
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);
|
||||
|
||||
~wxControl();
|
||||
|
||||
|
@@ -43,7 +43,7 @@ wxControl::wxControl()
|
||||
m_inSetValue = FALSE;
|
||||
}
|
||||
|
||||
wxControl::wxControl( wxWindow *parent,
|
||||
bool wxControl::Create( wxWindow *parent,
|
||||
wxWindowID id,
|
||||
const wxPoint &pos,
|
||||
const wxSize &size,
|
||||
@@ -51,11 +51,13 @@ wxControl::wxControl( wxWindow *parent,
|
||||
const wxValidator& validator,
|
||||
const wxString &name)
|
||||
{
|
||||
(void)Create(parent, id, pos, size, style, name);
|
||||
bool ret = wxWindow::Create(parent, id, pos, size, style, name);
|
||||
|
||||
#if wxUSE_VALIDATORS
|
||||
SetValidator(validator);
|
||||
#endif
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
wxControl::~wxControl()
|
||||
|
Reference in New Issue
Block a user