From: Vadim Zeitlin Date: Mon, 9 Feb 2004 22:04:14 +0000 (+0000) Subject: multiline checkbox doesn't make sense for listbook X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5982852a065688d1ccd9f72b748352ca96d16c18?hp=5d06f362eb30efce58dbeb5ea337b3c9d5ebc74b multiline checkbox doesn't make sense for listbook git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp index 2dec8d9a0c..c2f40aa6d6 100644 --- a/samples/notebook/notebook.cpp +++ b/samples/notebook/notebook.cpp @@ -254,8 +254,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") ); @@ -287,7 +289,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 @@ -359,8 +363,10 @@ void MyFrame::ReInitNotebook() break; } +#ifndef TEST_LISTBOOK if ( m_chkMultiLine->IsChecked() ) flags |= wxNB_MULTILINE; +#endif // !TEST_LISTBOOK MyNotebook *notebook = m_notebook; @@ -410,7 +416,9 @@ void MyFrame::ReInitNotebook() 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)