X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df0787b66229e2b5e26cabf9f62044563ab15961..8fdd04f882cd54893dcf0aff4940faac64e2efb9:/samples/widgets/widgets.cpp diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index e9aed3c767..c31cd567c3 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$ @@ -102,7 +102,7 @@ private: // and the image list for it wxImageList *m_imaglist; - // any class wishing to process wxWindows events must use this macro + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -164,7 +164,7 @@ private: }; // array of pages -WX_DEFINE_ARRAY_NO_PTR(WidgetsPage *, ArrayWidgetsPage); +WX_DEFINE_ARRAY_PTR(WidgetsPage *, ArrayWidgetsPage); // ---------------------------------------------------------------------------- // misc macros @@ -192,7 +192,7 @@ END_EVENT_TABLE() bool WidgetsApp::OnInit() { if ( !wxApp::OnInit() ) - return FALSE; + return false; // the reason for having these ifdef's is that I often run two copies of // this sample side by side and it is useful to see which one is which @@ -210,7 +210,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")); @@ -220,7 +220,7 @@ bool WidgetsApp::OnInit() //wxLog::AddTraceMask(_T("scrollbar")); //wxLog::AddTraceMask(_T("focus")); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -228,7 +228,7 @@ bool WidgetsApp::OnInit() // ---------------------------------------------------------------------------- WidgetsFrame::WidgetsFrame(const wxString& title) - : wxFrame(NULL, -1, title, + : wxFrame(NULL, wxID_ANY, title, wxPoint(0, 50), wxDefaultSize, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE | @@ -242,24 +242,24 @@ WidgetsFrame::WidgetsFrame(const wxString& title) m_imaglist = (wxImageList *)NULL; // create controls - m_panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN); + 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 // upper one and the log window with some buttons in the lower - m_notebook = new wxNotebook(m_panel, -1, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); + m_notebook = new wxNotebook(m_panel, wxID_ANY, wxDefaultPosition, + wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN); InitNotebook(); - wxSizer *sizerUp = new wxNotebookSizer(m_notebook); // the lower one only has the log listbox and a button to clear it - wxSizer *sizerDown = new wxStaticBoxSizer - ( - new wxStaticBox(m_panel, -1, _T("&Log window")), - wxVERTICAL - ); - m_lboxLog = new wxListBox(m_panel, -1); + wxSizer *sizerDown = new wxStaticBoxSizer( + new wxStaticBox( m_panel, wxID_ANY, _T("&Log window") ), + wxVERTICAL); + + m_lboxLog = new wxListBox(m_panel, wxID_ANY); sizerDown->Add(m_lboxLog, 1, wxGROW | wxALL, 5); sizerDown->SetMinSize(100, 150); @@ -272,20 +272,22 @@ WidgetsFrame::WidgetsFrame(const wxString& title) sizerDown->Add(sizerBtns, 0, wxALL | wxALIGN_RIGHT, 5); // put everything together - sizerTop->Add(sizerUp, 1, wxGROW | (wxALL & ~(wxTOP | wxBOTTOM)), 10); + sizerTop->Add(m_notebook, 1, wxGROW | (wxALL & ~(wxTOP | wxBOTTOM)), 10); sizerTop->Add(0, 5, 0, wxGROW); // spacer in between sizerTop->Add(sizerDown, 0, wxGROW | (wxALL & ~wxTOP), 10); - m_panel->SetAutoLayout(TRUE); m_panel->SetSizer(sizerTop); sizerTop->Fit(this); sizerTop->SetSizeHints(this); + // 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 } void WidgetsFrame::InitNotebook() @@ -317,7 +319,7 @@ void WidgetsFrame::InitNotebook() m_notebook->AddPage( pages[n], labels[n], - FALSE, // don't select + false, // don't select n // image id ); } @@ -354,8 +356,54 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label) { m_ctor = ctor; - m_next = WidgetsPage::ms_widgetPages; - WidgetsPage::ms_widgetPages = this; + m_next = NULL; + + // dummy sorting: add and immediately sort on list according to label + + if(WidgetsPage::ms_widgetPages) + { + WidgetsPageInfo *node_prev = WidgetsPage::ms_widgetPages; + if(wxStrcmp(label,node_prev->GetLabel().c_str())<0) + { + // add as first + m_next = node_prev; + WidgetsPage::ms_widgetPages = this; + } + else + { + WidgetsPageInfo *node_next; + do + { + node_next = node_prev->GetNext(); + if(node_next) + { + // add if between two + if(wxStrcmp(label,node_next->GetLabel().c_str())<0) + { + node_prev->SetNext(this); + m_next = node_next; + // force to break loop + node_next = NULL; + } + } + else + { + // add as last + node_prev->SetNext(this); + m_next = node_next; + } + node_prev = node_next; + }while(node_next); + } + } + else + { + // add when first + + WidgetsPage::ms_widgetPages = this; + + } + } // ---------------------------------------------------------------------------- @@ -363,7 +411,7 @@ WidgetsPageInfo::WidgetsPageInfo(Constructor ctor, const wxChar *label) // ---------------------------------------------------------------------------- WidgetsPage::WidgetsPage(wxNotebook *notebook) - : wxPanel(notebook, -1, + : wxPanel(notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_FULL_REPAINT_ON_RESIZE | wxCLIP_CHILDREN | @@ -376,7 +424,8 @@ wxSizer *WidgetsPage::CreateSizerWithText(wxControl *control, wxTextCtrl **ppText) { wxSizer *sizerRow = new wxBoxSizer(wxHORIZONTAL); - wxTextCtrl *text = new wxTextCtrl(this, id, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); + wxTextCtrl *text = new wxTextCtrl(this, id, wxEmptyString, + wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); sizerRow->Add(control, 0, wxRIGHT | wxALIGN_CENTRE_VERTICAL, 5); sizerRow->Add(text, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5); @@ -392,7 +441,8 @@ wxSizer *WidgetsPage::CreateSizerWithTextAndLabel(const wxString& label, wxWindowID id, wxTextCtrl **ppText) { - return CreateSizerWithText(new wxStaticText(this, -1, label), id, ppText); + return CreateSizerWithText(new wxStaticText(this, wxID_ANY, label), + id, ppText); } // create a sizer containing a button and a text ctrl