X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7bb70733bbb9941347ad349e3477c4da17b03381..14b4c0ff125b7bd175916f465e76a359b4fda706:/samples/widgets/widgets.cpp?ds=sidebyside diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index 6f51626845..62f9724543 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// -// Program: wxWindows Widgets Sample +// Program: wxWidgets Widgets Sample // Name: widgets.cpp -// Purpose: Sample showing most of the simple wxWindows widgets +// Purpose: Sample showing most of the simple wxWidgets widgets // Author: Vadim Zeitlin // Created: 27.03.01 // Id: $Id$ @@ -29,6 +29,8 @@ #include "wx/app.h" #include "wx/log.h" #include "wx/frame.h" + #include "wx/menu.h" + #include "wx/button.h" #include "wx/checkbox.h" #include "wx/listbox.h" @@ -37,8 +39,9 @@ #include "wx/textctrl.h" #endif -#include "wx/notebook.h" +#include "wx/bookctrl.h" #include "wx/sizer.h" +#include "wx/colordlg.h" #include "widgets.h" @@ -50,7 +53,9 @@ enum { Widgets_ClearLog = 100, - Widgets_Quit + Widgets_Quit, + Widgets_SetFgColour, + Widgets_SetBgColour }; // ---------------------------------------------------------------------------- @@ -80,32 +85,47 @@ public: protected: // event handlers +#if wxUSE_LOG void OnButtonClearLog(wxCommandEvent& event); - void OnButtonQuit(wxCommandEvent& event); +#endif // wxUSE_LOG + void OnExit(wxCommandEvent& event); +#if wxUSE_MENUS + void OnSetFgCol(wxCommandEvent& event); + void OnSetBgCol(wxCommandEvent& event); +#endif // wxUSE_MENUS - // initialize the notebook: add all pages to it - void InitNotebook(); + // initialize the book: add all pages to it + void InitBook(); private: // the panel containing everything wxPanel *m_panel; +#if wxUSE_LOG // the listbox for logging messages wxListBox *m_lboxLog; // the log target we use to redirect messages to the listbox wxLog *m_logTarget; +#endif // wxUSE_LOG - // the notebook containing the test pages - wxNotebook *m_notebook; + // the book containing the test pages + wxBookCtrl *m_book; // and the image list for it wxImageList *m_imaglist; - // any class wishing to process wxWindows events must use this macro +#if wxUSE_MENUS + // last chosen fg/bg colours + wxColour m_colFg, + m_colBg; +#endif // wxUSE_MENUS + + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; +#if wxUSE_LOG // A log target which just redirects the messages to a listbox class LboxLogger : public wxLog { @@ -162,6 +182,7 @@ private: // the old log target wxLog *m_logOld; }; +#endif // wxUSE_LOG // array of pages WX_DEFINE_ARRAY_PTR(WidgetsPage *, ArrayWidgetsPage); @@ -177,8 +198,14 @@ IMPLEMENT_APP(WidgetsApp) // ---------------------------------------------------------------------------- BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame) +#if wxUSE_LOG EVT_BUTTON(Widgets_ClearLog, WidgetsFrame::OnButtonClearLog) - EVT_BUTTON(Widgets_Quit, WidgetsFrame::OnButtonQuit) +#endif // wxUSE_LOG + EVT_BUTTON(Widgets_Quit, WidgetsFrame::OnExit) + + EVT_MENU(wxID_EXIT, WidgetsFrame::OnExit) + EVT_MENU(Widgets_SetFgColour, WidgetsFrame::OnSetFgCol) + EVT_MENU(Widgets_SetBgColour, WidgetsFrame::OnSetBgCol) END_EVENT_TABLE() // ============================================================================ @@ -210,7 +237,7 @@ bool WidgetsApp::OnInit() #elif defined(__WXMOTIF__) title += _T("wxMOTIF"); #else - title += _T("wxWindows"); + title += _T("wxWidgets"); #endif wxFrame *frame = new WidgetsFrame(title + _T(" widgets demo")); @@ -236,26 +263,40 @@ WidgetsFrame::WidgetsFrame(const wxString& title) wxTAB_TRAVERSAL) { // init everything +#if wxUSE_LOG m_lboxLog = (wxListBox *)NULL; m_logTarget = (wxLog *)NULL; - m_notebook = (wxNotebook *)NULL; +#endif // wxUSE_LOG + m_book = (wxBookCtrl *)NULL; m_imaglist = (wxImageList *)NULL; +#if wxUSE_MENUS + // create the menubar + wxMenuBar *mbar = new wxMenuBar; + wxMenu *menuWidget = new wxMenu; + menuWidget->Append(Widgets_SetFgColour, _T("Set &foreground...\tCtrl-F")); + menuWidget->Append(Widgets_SetBgColour, _T("Set &background...\tCtrl-B")); + menuWidget->AppendSeparator(); + menuWidget->Append(wxID_EXIT, _T("&Quit\tCtrl-Q")); + mbar->Append(menuWidget, _T("&Widget")); + SetMenuBar(mbar); +#endif // wxUSE_MENUS + // create controls m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN); wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); - // we have 2 panes: notebook which pages demonstrating the controls in the + // we have 2 panes: book which pages demonstrating the controls in the // upper one and the log window with some buttons in the lower - m_notebook = new wxNotebook(m_panel, wxID_ANY, wxDefaultPosition, - wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); - InitNotebook(); - wxSizer *sizerUp = new wxNotebookSizer(m_notebook); + m_book = new wxBookCtrl(m_panel, wxID_ANY, wxDefaultPosition, + wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN|wxBC_DEFAULT); + InitBook(); // the lower one only has the log listbox and a button to clear it +#if wxUSE_LOG wxSizer *sizerDown = new wxStaticBoxSizer( new wxStaticBox( m_panel, wxID_ANY, _T("&Log window") ), wxVERTICAL); @@ -263,17 +304,23 @@ WidgetsFrame::WidgetsFrame(const wxString& title) m_lboxLog = new wxListBox(m_panel, wxID_ANY); sizerDown->Add(m_lboxLog, 1, wxGROW | wxALL, 5); sizerDown->SetMinSize(100, 150); +#else + wxSizer *sizerDown = new wxBoxSizer(wxVERTICAL); +#endif // wxUSE_LOG wxBoxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL); - wxButton *btn = new wxButton(m_panel, Widgets_ClearLog, _T("Clear &log")); + wxButton *btn; +#if wxUSE_LOG + btn = new wxButton(m_panel, Widgets_ClearLog, _T("Clear &log")); sizerBtns->Add(btn); sizerBtns->Add(10, 0); // spacer +#endif // wxUSE_LOG btn = new wxButton(m_panel, Widgets_Quit, _T("E&xit")); sizerBtns->Add(btn); sizerDown->Add(sizerBtns, 0, wxALL | wxALIGN_RIGHT, 5); // put everything together - sizerTop->Add(sizerUp, 1, wxGROW | (wxALL & ~(wxTOP | wxBOTTOM)), 10); + sizerTop->Add(m_book, 1, wxGROW | (wxALL & ~(wxTOP | wxBOTTOM)), 10); sizerTop->Add(0, 5, 0, wxGROW); // spacer in between sizerTop->Add(sizerDown, 0, wxGROW | (wxALL & ~wxTOP), 10); @@ -282,28 +329,28 @@ WidgetsFrame::WidgetsFrame(const wxString& title) sizerTop->Fit(this); sizerTop->SetSizeHints(this); +#if wxUSE_LOG && !defined(__WXCOCOA__) // wxCocoa's listbox is too flakey to use for logging right now - #if !defined(__WXCOCOA__) // now that everything is created we can redirect the log messages to the // listbox m_logTarget = new LboxLogger(m_lboxLog, wxLog::GetActiveTarget()); wxLog::SetActiveTarget(m_logTarget); - #endif +#endif } -void WidgetsFrame::InitNotebook() +void WidgetsFrame::InitBook() { m_imaglist = new wxImageList(32, 32); ArrayWidgetsPage pages; wxArrayString labels; - // we need to first create all pages and only then add them to the notebook + // we need to first create all pages and only then add them to the book // as we need the image list first WidgetsPageInfo *info = WidgetsPage::ms_widgetPages; while ( info ) { - WidgetsPage *page = (*info->GetCtor())(m_notebook, m_imaglist); + WidgetsPage *page = (*info->GetCtor())(m_book, m_imaglist); pages.Add(page); labels.Add(info->GetLabel()); @@ -311,24 +358,26 @@ void WidgetsFrame::InitNotebook() info = info->GetNext(); } - m_notebook->SetImageList(m_imaglist); + m_book->SetImageList(m_imaglist); // now do add them size_t count = pages.GetCount(); for ( size_t n = 0; n < count; n++ ) { - m_notebook->AddPage( - pages[n], - labels[n], - false, // don't select - n // image id - ); + m_book->AddPage( + pages[n], + labels[n], + false, // don't select + n // image id + ); } } WidgetsFrame::~WidgetsFrame() { +#if wxUSE_LOG delete m_logTarget; +#endif // wxUSE_LOG delete m_imaglist; } @@ -336,15 +385,47 @@ WidgetsFrame::~WidgetsFrame() // WidgetsFrame event handlers // ---------------------------------------------------------------------------- -void WidgetsFrame::OnButtonQuit(wxCommandEvent& WXUNUSED(event)) +void WidgetsFrame::OnExit(wxCommandEvent& WXUNUSED(event)) { Close(); } +#if wxUSE_LOG void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event)) { m_lboxLog->Clear(); } +#endif // wxUSE_LOG + +#if wxUSE_MENUS + +void WidgetsFrame::OnSetFgCol(wxCommandEvent& WXUNUSED(event)) +{ + wxColour col = wxGetColourFromUser(this, m_colFg); + if ( !col.Ok() ) + return; + + m_colFg = col; + + WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage); + page->GetWidget()->SetForegroundColour(m_colFg); + page->GetWidget()->Refresh(); +} + +void WidgetsFrame::OnSetBgCol(wxCommandEvent& WXUNUSED(event)) +{ + wxColour col = wxGetColourFromUser(this, m_colBg); + if ( !col.Ok() ) + return; + + m_colBg = col; + + WidgetsPage *page = wxStaticCast(m_book->GetCurrentPage(), WidgetsPage); + page->GetWidget()->SetBackgroundColour(m_colBg); + page->GetWidget()->Refresh(); +} + +#endif // wxUSE_MENUS // ---------------------------------------------------------------------------- // WidgetsPageInfo @@ -411,8 +492,8 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label) // WidgetsPage // ---------------------------------------------------------------------------- -WidgetsPage::WidgetsPage(wxNotebook *notebook) - : wxPanel(notebook, wxID_ANY, +WidgetsPage::WidgetsPage(wxBookCtrl *book) + : wxPanel(book, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE | wxCLIP_CHILDREN |