#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/log.h"
- #include "wx/panel.h"
#include "wx/frame.h"
#include "wx/button.h"
#include "wx/checkbox.h"
}
}
- virtual void DoLogString(const wxChar *szString, time_t t)
+ virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t))
{
wxString msg;
TimeStamp(&msg);
};
// array of pages
-WX_DEFINE_ARRAY(WidgetsPage *, ArrayWidgetsPage);
+WX_DEFINE_ARRAY_PTR(WidgetsPage *, ArrayWidgetsPage);
// ----------------------------------------------------------------------------
// misc macros
bool WidgetsApp::OnInit()
{
+ if ( !wxApp::OnInit() )
+ 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
wxString title;
#if defined(__WXUNIVERSAL__)
- title = _T("wxUniv/")
+ title = _T("wxUniv/");
#endif
#if defined(__WXMSW__)
title += _T("wxMSW");
#elif defined(__WXGTK__)
title += _T("wxGTK");
+#elif defined(__WXMAC__)
+ title += _T("wxMAC");
+#elif defined(__WXMOTIF__)
+ title += _T("wxMOTIF");
#else
title += _T("wxWindows");
#endif
//wxLog::AddTraceMask(_T("listbox"));
//wxLog::AddTraceMask(_T("scrollbar"));
+ //wxLog::AddTraceMask(_T("focus"));
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
WidgetsFrame::WidgetsFrame(const wxString& title)
- : wxFrame(NULL, -1, title, wxPoint(0, 50))
+ : wxFrame(NULL, wxID_ANY, title,
+ wxPoint(0, 50), wxDefaultSize,
+ wxDEFAULT_FRAME_STYLE |
+ wxNO_FULL_REPAINT_ON_RESIZE |
+ wxCLIP_CHILDREN |
+ wxTAB_TRAVERSAL)
{
// init everything
m_lboxLog = (wxListBox *)NULL;
m_imaglist = (wxImageList *)NULL;
// create controls
- m_panel = new wxPanel(this, -1);
+ 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);
+ 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);
+
wxBoxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);
wxButton *btn = new wxButton(m_panel, Widgets_ClearLog, _T("Clear &log"));
sizerBtns->Add(btn);
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()
m_notebook->AddPage(
pages[n],
labels[n],
- FALSE, // don't select
+ false, // don't select
n // image id
);
}
Close();
}
-void WidgetsFrame::OnButtonClearLog(wxCommandEvent& event)
+void WidgetsFrame::OnButtonClearLog(wxCommandEvent& WXUNUSED(event))
{
m_lboxLog->Clear();
}
{
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;
+
+ }
+
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
WidgetsPage::WidgetsPage(wxNotebook *notebook)
- : wxPanel(notebook, -1)
+ : wxPanel(notebook, wxID_ANY,
+ wxDefaultPosition, wxDefaultSize,
+ wxNO_FULL_REPAINT_ON_RESIZE |
+ wxCLIP_CHILDREN |
+ wxTAB_TRAVERSAL)
{
}
wxTextCtrl **ppText)
{
wxSizer *sizerRow = new wxBoxSizer(wxHORIZONTAL);
- wxTextCtrl *text = new wxTextCtrl(this, id, _T(""));
+ 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);
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
projects / wxWidgets.git / blobdiff