Added --enable-extended_rtti configure switch (defaults to disabled).
Fix compilation when WXINTL_NO_GETTEXT_MACRO is defined. Added wx/flags.h to installed files. Fix XTI compilation after wxString changes. Fix 'virtual functions but non-virtual destructor' GCC warnings. Minimal XTI definition for wxOwnerDrawnComboBox (cut'n'paste from wxComboBox, will need to be completed). Requires rerunning bakefile and autoconf. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -797,7 +797,19 @@ BEGIN_EVENT_TABLE(wxOwnerDrawnComboBox, wxComboCtrl)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
|
||||
#if wxUSE_EXTENDED_RTTI
|
||||
IMPLEMENT_DYNAMIC_CLASS2_XTI(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems, "wx/odcombo.h")
|
||||
|
||||
wxBEGIN_PROPERTIES_TABLE(wxOwnerDrawnComboBox)
|
||||
wxEND_PROPERTIES_TABLE()
|
||||
|
||||
wxBEGIN_HANDLERS_TABLE(wxOwnerDrawnComboBox)
|
||||
wxEND_HANDLERS_TABLE()
|
||||
|
||||
wxCONSTRUCTOR_5( wxOwnerDrawnComboBox , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size )
|
||||
#else
|
||||
IMPLEMENT_DYNAMIC_CLASS2(wxOwnerDrawnComboBox, wxComboCtrl, wxControlWithItems)
|
||||
#endif
|
||||
|
||||
void wxOwnerDrawnComboBox::Init()
|
||||
{
|
||||
|
Reference in New Issue
Block a user