From 47f73cc455dbea0fce068931cfd9d7df49127e21 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 7 Jan 2011 22:46:52 +0000 Subject: [PATCH] bracketing xti-only methods git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/menucmn.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp index aa0ed91bf8..517142f4e2 100644 --- a/src/common/menucmn.cpp +++ b/src/common/menucmn.cpp @@ -60,11 +60,13 @@ wxEND_FLAGS( wxMenuStyle ) wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxMenu, wxEvtHandler, "wx/menu.h") wxCOLLECTION_TYPE_INFO( wxMenuItem *, wxMenuItemList ) ; +#if wxUSE_EXTENDED_RTTI template<> void wxCollectionToVariantArray( wxMenuItemList const &theList, wxAnyList &value) { wxListCollectionToAnyList( theList, value ) ; } +#endif wxBEGIN_PROPERTIES_TABLE(wxMenu) wxEVENT_PROPERTY( Select, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent) @@ -90,6 +92,7 @@ wxBEGIN_FLAGS( wxMenuBarStyle ) wxFLAGS_MEMBER(wxMB_DOCKABLE) wxEND_FLAGS( wxMenuBarStyle ) +#if wxUSE_EXTENDED_RTTI // the negative id would lead the window (its superclass !) to // vetoe streaming out otherwise bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxObjectWriter *, @@ -97,6 +100,7 @@ bool wxMenuBarStreamingCallback( const wxObject *WXUNUSED(object), wxObjectWrite { return true; } +#endif wxIMPLEMENT_DYNAMIC_CLASS_XTI_CALLBACK(wxMenuBar, wxWindow, "wx/menu.h", \ wxMenuBarStreamingCallback) -- 2.45.2