X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b90b51ceb7eadbef93c256a42af49dae0659d34..8647bec62d5d0112201f07494e0e69e6e2d45e4b:/samples/widgets/widgets.cpp?ds=sidebyside diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp index 8f7a058834..b4d38ea141 100644 --- a/samples/widgets/widgets.cpp +++ b/samples/widgets/widgets.cpp @@ -205,6 +205,10 @@ bool WidgetsApp::OnInit() 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 @@ -214,6 +218,7 @@ bool WidgetsApp::OnInit() //wxLog::AddTraceMask(_T("listbox")); //wxLog::AddTraceMask(_T("scrollbar")); + //wxLog::AddTraceMask(_T("focus")); return TRUE; } @@ -251,6 +256,8 @@ WidgetsFrame::WidgetsFrame(const wxString& title) ); m_lboxLog = new wxListBox(m_panel, -1); 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); @@ -360,7 +367,8 @@ wxSizer *WidgetsPage::CreateSizerWithText(wxControl *control, wxTextCtrl **ppText) { wxSizer *sizerRow = new wxBoxSizer(wxHORIZONTAL); - wxTextCtrl *text = new wxTextCtrl(this, id, _T("")); + wxTextCtrl *text = new wxTextCtrl(this, id, _T(""), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); + sizerRow->Add(control, 0, wxRIGHT | wxALIGN_CENTRE_VERTICAL, 5); sizerRow->Add(text, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5);