Restored correct RTTI for wxNotebook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -84,7 +84,7 @@ wxFLAGS_MEMBER(wxNB_NOPAGETHEME)
|
|||||||
wxFLAGS_MEMBER(wxNB_FLAT)
|
wxFLAGS_MEMBER(wxNB_FLAT)
|
||||||
wxEND_FLAGS( wxNotebookStyle )
|
wxEND_FLAGS( wxNotebookStyle )
|
||||||
|
|
||||||
#if wxUSE_EXTENDED_RTTI
|
#if wxUSE_EXTENDED_RTTI
|
||||||
|
|
||||||
WX_DEFINE_LIST( wxNotebookPageInfoList )
|
WX_DEFINE_LIST( wxNotebookPageInfoList )
|
||||||
|
|
||||||
@@ -119,7 +119,7 @@ wxCONSTRUCTOR_4( wxNotebookPageInfo, wxNotebookPage*, Page, \
|
|||||||
|
|
||||||
void wxNotebookBase::AddPageInfo( wxNotebookPageInfo* info )
|
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
|
const wxNotebookPageInfoList& wxNotebookBase::GetPageInfos() const
|
||||||
@@ -138,7 +138,7 @@ const wxNotebookPageInfoList& wxNotebookBase::GetPageInfos() const
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxControl, "wx/notebook.h")
|
wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxBookCtrlBase, "wx/notebook.h")
|
||||||
wxBEGIN_PROPERTIES_TABLE(wxNotebook)
|
wxBEGIN_PROPERTIES_TABLE(wxNotebook)
|
||||||
wxEVENT_PROPERTY( PageChanging, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxNotebookEvent )
|
wxEVENT_PROPERTY( PageChanging, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, wxNotebookEvent )
|
||||||
wxEVENT_PROPERTY( PageChanged, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEvent )
|
wxEVENT_PROPERTY( PageChanged, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, wxNotebookEvent )
|
||||||
|
Reference in New Issue
Block a user