From a74fd546021b07a8059b19cfa95ef91f9b4d05b9 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 5 Mar 2012 18:00:34 +0000 Subject: [PATCH] Restored correct RTTI for wxNotebook git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/nbkbase.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp index d3e76ba250..a0b6a8b45a 100644 --- a/src/common/nbkbase.cpp +++ b/src/common/nbkbase.cpp @@ -84,7 +84,7 @@ wxFLAGS_MEMBER(wxNB_NOPAGETHEME) wxFLAGS_MEMBER(wxNB_FLAT) wxEND_FLAGS( wxNotebookStyle ) -#if wxUSE_EXTENDED_RTTI +#if wxUSE_EXTENDED_RTTI WX_DEFINE_LIST( wxNotebookPageInfoList ) @@ -119,7 +119,7 @@ wxCONSTRUCTOR_4( wxNotebookPageInfo, wxNotebookPage*, Page, \ void wxNotebookBase::AddPageInfo( wxNotebookPageInfo* info ) { - AddPage( info->GetPage(), info->GetText(), info->GetSelected(), info->GetImageId() ); + AddPage( info->GetPage(), info->GetText(), info->GetSelected(), info->GetImageId() ); } const wxNotebookPageInfoList& wxNotebookBase::GetPageInfos() const @@ -138,7 +138,7 @@ const wxNotebookPageInfoList& wxNotebookBase::GetPageInfos() const #endif -wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxControl, "wx/notebook.h") +wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxBookCtrlBase, "wx/notebook.h") wxBEGIN_PROPERTIES_TABLE(wxNotebook) wxEVENT_PROPERTY( PageChanging, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxNotebookEvent ) wxEVENT_PROPERTY( PageChanged, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEvent ) -- 2.45.2