Events table serves for RTTI too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -110,9 +110,13 @@ wxBEGIN_HANDLERS_TABLE(wxComboBox)
|
|||||||
wxEND_HANDLERS_TABLE()
|
wxEND_HANDLERS_TABLE()
|
||||||
|
|
||||||
wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
|
wxCONSTRUCTOR_5( wxComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
|
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(wxComboBox, wxControl)
|
BEGIN_EVENT_TABLE(wxComboBox, wxControl)
|
||||||
EVT_MENU(wxID_CUT, wxComboBox::OnCut)
|
EVT_MENU(wxID_CUT, wxComboBox::OnCut)
|
||||||
EVT_MENU(wxID_COPY, wxComboBox::OnCopy)
|
EVT_MENU(wxID_COPY, wxComboBox::OnCopy)
|
||||||
@@ -131,8 +135,6 @@ BEGIN_EVENT_TABLE(wxComboBox, wxControl)
|
|||||||
EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
|
EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// function prototypes
|
// function prototypes
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -686,8 +688,8 @@ void wxComboBox::GetSelection(long* from, long* to) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
int wxComboBox::GetSelection() const
|
int wxComboBox::GetSelection() const
|
||||||
{
|
{
|
||||||
return wxChoice::GetSelection();
|
return wxChoice::GetSelection();
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user