Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make it possible to use this sample for wxListbook testing too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-08-21 23:12:41 +00:00
parent 5b5e4f325c
commit 4e62c3fd3b
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/notebook/notebook.cpp
View File

@@ -380,7 +380,7 @@ void MyFrame::ReInitNotebook()
{
wxString str = notebook->GetPageText(n);
wxNotebookPage *page = m_notebook->CreatePage(str);
wxWindow *page = m_notebook->CreatePage(str);
m_notebook->AddPage(page, str, FALSE, m_notebook->GetIconIndex() );
}
@@ -400,7 +400,7 @@ void MyFrame::ReInitNotebook()
}
m_sizerNotebook = new wxNotebookSizer(m_notebook);
m_sizerNotebook = new wxBookCtrlSizer(m_notebook);
m_sizerTop->Add(m_sizerNotebook, 1, wxEXPAND | wxALL, 4);
m_sizerTop->Layout();
}

28
samples/notebook/notebook.h
View File

@@ -9,7 +9,31 @@
// License: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include "wx/notebook.h"
// this sample can be used to test both wxNotebook and wxListbook
//#define TEST_LISTBOOK
#ifdef TEST_LISTBOOK
#include "wx/listbook.h"
#define wxNotebook wxListbook
#define wxNotebookEvent wxListbookEvent
#define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED
#define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING
#define EVT_NOTEBOOK_PAGE_CHANGED EVT_LISTBOOK_PAGE_CHANGED
#define EVT_NOTEBOOK_PAGE_CHANGING EVT_LISTBOOK_PAGE_CHANGING
#undef wxNB_TOP
#define wxNB_TOP wxLB_TOP
#undef wxNB_BOTTOM
#define wxNB_BOTTOM wxLB_BOTTOM
#undef wxNB_LEFT
#define wxNB_LEFT wxLB_LEFT
#undef wxNB_RIGHT
#define wxNB_RIGHT wxLB_RIGHT
#else
#include "wx/notebook.h"
#endif
// Define a new application
class MyApp : public wxApp
@@ -106,7 +130,7 @@ private:
wxBoxSizer *m_sizerTop;
// Sizer for m_notebook
wxNotebookSizer *m_sizerNotebook;
wxBookCtrlSizer *m_sizerNotebook;
wxImageList *m_imageList;