X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a6c9e31b0731764f26a3124f7d0dabaa86a1a06..bc1825091570ac350e632219fe64f13cc0cb038f:/samples/notebook/notebook.cpp diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp index 2dec8d9a0c..f5ed8758e1 100644 --- a/samples/notebook/notebook.cpp +++ b/samples/notebook/notebook.cpp @@ -5,7 +5,7 @@ // Modified by: Dimitri Schoolwerth // Created: 26/10/98 // RCS-ID: $Id$ -// Copyright: (c) 1998-2002 wxWindows team +// Copyright: (c) 1998-2002 wxWidgets team // License: wxWindows license ///////////////////////////////////////////////////////////////////////////// @@ -33,15 +33,15 @@ bool MyApp::OnInit() // Problem with generic wxNotebook implementation whereby it doesn't size // properly unless you set the size again -#if defined(__WIN16__) || defined(__WXMOTIF__) +#if defined(__WXMOTIF__) int width, height; frame->GetSize(& width, & height); - frame->SetSize(-1, -1, width, height); + frame->SetSize(wxDefaultCoord, wxDefaultCoord, width, height); #endif frame->Show(); - return TRUE; + return true; } MyNotebook::MyNotebook(wxWindow *parent, wxWindowID id, @@ -92,8 +92,8 @@ wxPanel *MyNotebook::CreateUserCreatedPage() { wxPanel *panel = new wxPanel(this); - (void) new wxButton( panel, -1, wxT("Button"), - wxPoint(10, 10), wxSize(-1, -1) ); + (void) new wxButton( panel, wxID_ANY, wxT("Button"), + wxPoint(10, 10), wxDefaultSize ); return panel; } @@ -105,13 +105,13 @@ wxPanel *MyNotebook::CreateRadioButtonsPage() wxString animals[] = { wxT("Fox"), wxT("Hare"), wxT("Rabbit"), wxT("Sabre-toothed tiger"), wxT("T Rex") }; - wxRadioBox *radiobox1 = new wxRadioBox(panel, -1, wxT("Choose one"), + wxRadioBox *radiobox1 = new wxRadioBox(panel, wxID_ANY, wxT("Choose one"), wxDefaultPosition, wxDefaultSize, 5, animals, 2, wxRA_SPECIFY_ROWS); wxString computers[] = { wxT("Amiga"), wxT("Commodore 64"), wxT("PET"), wxT("Another") }; - wxRadioBox *radiobox2 = new wxRadioBox(panel, -1, + wxRadioBox *radiobox2 = new wxRadioBox(panel, wxID_ANY, wxT("Choose your favourite"), wxDefaultPosition, wxDefaultSize, 4, computers, 0, wxRA_SPECIFY_COLS); @@ -127,7 +127,7 @@ wxPanel *MyNotebook::CreateVetoPage() { wxPanel *panel = new wxPanel(this); - (void) new wxStaticText( panel, -1, + (void) new wxStaticText( panel, wxID_ANY, wxT("This page intentionally left blank"), wxPoint(10, 10) ); return panel; @@ -137,8 +137,7 @@ wxPanel *MyNotebook::CreateBigButtonPage() { wxPanel *panel = new wxPanel(this); - wxButton *buttonBig = new wxButton( panel, -1, wxT("Maximized button"), - wxPoint(0, 0), wxSize(480, 360) ); + wxButton *buttonBig = new wxButton(panel, wxID_ANY, wxT("Maximized button")); wxBoxSizer *sizerPanel = new wxBoxSizer(wxVERTICAL); sizerPanel->Add(buttonBig, 1, wxEXPAND); @@ -153,7 +152,7 @@ wxPanel *MyNotebook::CreateInsertPage() wxPanel *panel = new wxPanel(this); panel->SetBackgroundColour( wxColour( wxT("MAROON") ) ); - (void) new wxStaticText( panel, -1, + (void) new wxStaticText( panel, wxID_ANY, wxT("This page has been inserted, not added."), wxPoint(10, 10) ); return panel; @@ -164,16 +163,16 @@ void MyNotebook::CreateInitialPages() // Create and add some panels to the notebook wxPanel *panel = CreateRadioButtonsPage(); - AddPage( panel, RADIOBUTTONS_PAGE_NAME, FALSE, GetIconIndex() ); + AddPage( panel, RADIOBUTTONS_PAGE_NAME, false, GetIconIndex() ); panel = CreateVetoPage(); - AddPage( panel, VETO_PAGE_NAME, FALSE, GetIconIndex() ); + AddPage( panel, VETO_PAGE_NAME, false, GetIconIndex() ); panel = CreateBigButtonPage(); - AddPage( panel, MAXIMIZED_BUTTON_PAGE_NAME, FALSE, GetIconIndex() ); + AddPage( panel, MAXIMIZED_BUTTON_PAGE_NAME, false, GetIconIndex() ); panel = CreateInsertPage(); - InsertPage( 0, panel, I_WAS_INSERTED_PAGE_NAME, FALSE, GetIconIndex() ); + InsertPage( 0, panel, I_WAS_INSERTED_PAGE_NAME, false, GetIconIndex() ); SetSelection(1); @@ -195,7 +194,7 @@ int MyNotebook::GetIconIndex() const MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style) - : wxFrame((wxWindow *) NULL, -1, title, pos, size, style) + : wxFrame((wxWindow *) NULL, wxID_ANY, title, pos, size, style) { m_panel = (wxPanel *) NULL; m_notebook = (MyNotebook *) NULL; @@ -226,7 +225,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, wxArtProvider::GetIcon(wxART_ERROR, wxART_OTHER, imageSize) ); - m_panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, + m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxCLIP_CHILDREN | wxNO_BORDER | wxNO_FULL_REPAINT_ON_RESIZE); // Create remaining controls @@ -254,8 +253,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, m_chkShowImages = new wxCheckBox( m_panel, ID_CHK_SHOWIMAGES, wxT("&Show images") ); +#ifndef TEST_LISTBOOK m_chkMultiLine = new wxCheckBox( m_panel, ID_CHK_MULTILINE, wxT("&Multiple lines") ); +#endif // !TEST_LISTBOOK m_btnAddPage = new wxButton( m_panel, ID_BTN_ADD_PAGE, wxT("&Add page") ); @@ -274,10 +275,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, m_btnExit = new wxButton( m_panel, wxID_OK, wxT("&Exit") ); m_btnExit->SetDefault(); - m_text = new wxTextCtrl(m_panel, -1, wxEmptyString, +#if wxUSE_LOG + m_text = new wxTextCtrl(m_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY); m_logTargetOld = wxLog::SetActiveTarget( new wxLogTextCtrl(m_text) ); +#endif // wxUSE_LOG // Set sizers m_sizerFrame = new wxBoxSizer(wxVERTICAL); @@ -287,7 +290,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, wxBoxSizer *sizerLeft = new wxBoxSizer(wxVERTICAL); sizerLeft->Add(m_radioOrient, 0, wxEXPAND); sizerLeft->Add(m_chkShowImages, 0, wxEXPAND | wxTOP, 4); +#ifndef TEST_LISTBOOK sizerLeft->Add(m_chkMultiLine, 0, wxEXPAND | wxTOP, 4); +#endif // !TEST_LISTBOOK sizerLeft->Add(0, 0, 1); // Spacer @@ -305,16 +310,17 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, m_sizerFrame->Add(m_sizerTop, 1, wxEXPAND); +#if wxUSE_LOG m_sizerFrame->Add(m_text, 0, wxEXPAND); +#endif // wxUSE_LOG ReInitNotebook(); m_notebook->CreateInitialPages(); m_panel->SetSizer(m_sizerFrame); - m_panel->SetAutoLayout(TRUE); - m_sizerFrame->Fit(this); + m_sizerFrame->SetSizeHints(this); Centre(wxBOTH); @@ -322,7 +328,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, MyFrame::~MyFrame() { +#if wxUSE_LOG delete wxLog::SetActiveTarget(m_logTargetOld); +#endif // wxUSE_LOG if (m_imageList) { @@ -359,8 +367,10 @@ void MyFrame::ReInitNotebook() break; } +#ifndef TEST_LISTBOOK if ( m_chkMultiLine->IsChecked() ) flags |= wxNB_MULTILINE; +#endif // !TEST_LISTBOOK MyNotebook *notebook = m_notebook; @@ -383,14 +393,11 @@ void MyFrame::ReInitNotebook() wxString str = notebook->GetPageText(n); wxWindow *page = m_notebook->CreatePage(str); - m_notebook->AddPage(page, str, FALSE, m_notebook->GetIconIndex() ); - } - - if (m_sizerNotebook) - { - m_sizerTop->Remove(m_sizerNotebook); + m_notebook->AddPage(page, str, false, m_notebook->GetIconIndex() ); } + m_sizerTop->Detach(notebook); + delete notebook; // restore selection @@ -402,15 +409,16 @@ void MyFrame::ReInitNotebook() } - m_sizerNotebook = new wxBookCtrlSizer(m_notebook); - m_sizerTop->Add(m_sizerNotebook, 1, wxEXPAND | wxALL, 4); + m_sizerTop->Add(m_notebook, 1, wxEXPAND | wxALL, 4); m_sizerTop->Layout(); } BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_RADIOBOX(ID_RADIO_ORIENT, MyFrame::OnCheckOrRadioBox) EVT_CHECKBOX(ID_CHK_SHOWIMAGES, MyFrame::OnCheckOrRadioBox) +#ifndef TEST_LISTBOOK EVT_CHECKBOX(ID_CHK_MULTILINE, MyFrame::OnCheckOrRadioBox) +#endif // !TEST_LISTBOOK EVT_BUTTON(ID_BTN_ADD_PAGE, MyFrame::OnButtonAddPage) EVT_BUTTON(ID_BTN_INSERT_PAGE, MyFrame::OnButtonInsertPage) @@ -437,14 +445,14 @@ void MyFrame::OnButtonAddPage( wxCommandEvent& WXUNUSED(event) ) { static unsigned s_pageAdded = 0; - wxPanel *panel = new wxPanel( m_notebook, -1 ); - (void) new wxButton( panel, -1, wxT("First button"), - wxPoint(10, 10), wxSize(-1, -1) ); - (void) new wxButton( panel, -1, wxT("Second button"), - wxPoint(50, 100), wxSize(-1, -1) ); + wxPanel *panel = new wxPanel( m_notebook, wxID_ANY ); + (void) new wxButton( panel, wxID_ANY, wxT("First button"), + wxPoint(10, 10), wxDefaultSize ); + (void) new wxButton( panel, wxID_ANY, wxT("Second button"), + wxPoint(50, 100), wxDefaultSize ); m_notebook->AddPage(panel, wxString::Format(ADDED_PAGE_NAME wxT("%u"), - ++s_pageAdded), TRUE, m_notebook->GetIconIndex() ); + ++s_pageAdded), true, m_notebook->GetIconIndex() ); } void MyFrame::OnButtonInsertPage( wxCommandEvent& WXUNUSED(event) ) @@ -454,7 +462,7 @@ void MyFrame::OnButtonInsertPage( wxCommandEvent& WXUNUSED(event) ) wxPanel *panel = m_notebook->CreateUserCreatedPage(); m_notebook->InsertPage( 0, panel, - wxString::Format(INSERTED_PAGE_NAME wxT("%u"), ++s_pageIns), FALSE, + wxString::Format(INSERTED_PAGE_NAME wxT("%u"), ++s_pageIns), false, m_notebook->GetIconIndex() ); m_notebook->SetSelection(0); @@ -528,7 +536,9 @@ void MyFrame::OnNotebook(wxNotebookEvent& event) wxLogMessage(wxT("Notebook event #%d: %s (%d)"), s_numNotebookEvents++, str.c_str(), eventType); +#if wxUSE_LOG m_text->SetInsertionPointEnd(); +#endif // wxUSE_LOG event.Skip(); }