use a single wxBookCtrlEvent class for all wxBookCtrlBase-derived controls (#9667)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -64,7 +64,6 @@ BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxBookCtrlBase)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent)
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
@@ -216,7 +215,7 @@ int wxNotebook::SetSelection( size_t nPage )
|
||||
|
||||
if (nPage != (size_t)m_nSelection)
|
||||
{
|
||||
wxNotebookEvent vEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
|
||||
wxBookCtrlEvent vEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
|
||||
,m_windowId
|
||||
);
|
||||
|
||||
@@ -683,7 +682,7 @@ void wxNotebook::OnSize(
|
||||
} // end of wxNotebook::OnSize
|
||||
|
||||
void wxNotebook::OnSelChange (
|
||||
wxNotebookEvent& rEvent
|
||||
wxBookCtrlEvent& rEvent
|
||||
)
|
||||
{
|
||||
//
|
||||
|
||||
@@ -2548,7 +2548,7 @@ MRESULT wxWindowOS2::OS2WindowProc( WXUINT uMsg,
|
||||
(pPage->ulPageIdNew > 0L && pPage->ulPageIdCur > 0L))
|
||||
{
|
||||
wxWindowOS2* pWin = wxFindWinFromHandle(pPage->hwndBook);
|
||||
wxNotebookEvent vEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
|
||||
wxBookCtrlEvent vEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
|
||||
,(int)SHORT1FROMMP(wParam)
|
||||
,(int)pPage->ulPageIdNew
|
||||
,(int)pPage->ulPageIdCur
|
||||
|
||||
Reference in New Issue
Block a user