Change '--with-odbc' to use the WX_ARG_SYS_WITH macro instead of

[wxWidgets.git] / samples / widgets / widgets.cpp

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index c6069c0bb63504cc2ecfe148340ae92f27d66795..b4d38ea1412dd563596999629319dbcd5d39cbcf 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -218,6 +218,7 @@ bool WidgetsApp::OnInit()
 
     //wxLog::AddTraceMask(_T("listbox"));
     //wxLog::AddTraceMask(_T("scrollbar"));
 
     //wxLog::AddTraceMask(_T("listbox"));
     //wxLog::AddTraceMask(_T("scrollbar"));

+    //wxLog::AddTraceMask(_T("focus"));

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -255,7 +256,7 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
                              );
     m_lboxLog = new wxListBox(m_panel, -1);
     sizerDown->Add(m_lboxLog, 1, wxGROW | wxALL, 5);
                              );
     m_lboxLog = new wxListBox(m_panel, -1);
     sizerDown->Add(m_lboxLog, 1, wxGROW | wxALL, 5);

-    sizerDown->SetMinSize(100, 200);
+    sizerDown->SetMinSize(100, 150);

 
     wxBoxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);
     wxButton *btn = new wxButton(m_panel, Widgets_ClearLog, _T("Clear &log"));
 
     wxBoxSizer *sizerBtns = new wxBoxSizer(wxHORIZONTAL);
     wxButton *btn = new wxButton(m_panel, Widgets_ClearLog, _T("Clear &log"));


@@ -366,7 +367,8 @@ wxSizer *WidgetsPage::CreateSizerWithText(wxControl *control,
                                           wxTextCtrl **ppText)
 {
     wxSizer *sizerRow = new wxBoxSizer(wxHORIZONTAL);
                                           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);
 
     sizerRow->Add(control, 0, wxRIGHT | wxALIGN_CENTRE_VERTICAL, 5);
     sizerRow->Add(text, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5);