#endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL
- void OnSpinCtrl(wxSpinEvent& event);
+ void OnSpinCtrl(wxCommandEvent& event);
#endif // wxUSE_SPINCTRL
void OnEnableAll(wxCommandEvent& event);
// Create the main frame window
MyFrame *frame = new MyFrame((wxFrame *) NULL,
"Controls wxWindows App",
- x, y, 530, 420);
+ x, y, 540, 430);
+
+ frame->SetSizeHints( 500, 425 );
// Give it an icon
// The wxICON() macros loads an icon from a resource under Windows
frame->Show(TRUE);
frame->SetCursor(wxCursor(wxCURSOR_HAND));
- frame->GetPanel()->m_notebook->SetSelection(3);
+ frame->GetPanel()->m_notebook->SetSelection(6);
SetTopWindow(frame);
EVT_BUTTON (ID_BTNPROGRESS, MyPanel::OnShowProgress)
#endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL
-EVT_SPIN (ID_SPINCTRL, MyPanel::OnSpinCtrl)
+EVT_SPINCTRL (ID_SPINCTRL, MyPanel::OnSpinCtrl)
#endif // wxUSE_SPINCTRL
EVT_BUTTON (ID_BUTTON_LABEL, MyPanel::OnUpdateLabel)
EVT_CHECKBOX (ID_CHANGE_COLOUR, MyPanel::OnChangeColour)
: wxPanel( frame, -1, wxPoint(x, y), wxSize(w, h) ),
m_text(NULL), m_notebook(NULL)
{
+ wxLayoutConstraints *c;
+
m_text = new wxTextCtrl( this, -1, "This is the log window.\n", wxPoint(0,50), wxSize(100,50), wxTE_MULTILINE );
// m_text->SetBackgroundColour("wheat");
- delete wxLog::SetActiveTarget(new wxLogStderr);
+ //delete wxLog::SetActiveTarget(new wxLogStderr);
m_notebook = new wxNotebook( this, ID_NOTEBOOK, wxPoint(0,0), wxSize(200,150) );
(void)new wxButton( panel, ID_LISTBOX_APPEND, "Append 'Hi!'", wxPoint(340,80), wxSize(140,30) );
(void)new wxButton( panel, ID_LISTBOX_DELETE, "Delete selected item", wxPoint(180,130), wxSize(140,30) );
wxButton *button = new wxButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) );
+
+ button->SetDefault();
+
+ button->SetForegroundColour(*wxBLUE);
+
#if wxUSE_TOOLTIPS
button->SetToolTip( "Press here to set italic font" );
#endif // wxUSE_TOOLTIPS
panel = new wxPanel(m_notebook);
(void)new wxStaticBox( panel, -1, "Box around combobox",
wxPoint(5, 5), wxSize(150, 100));
- m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(20,20), wxSize(120,-1), 5, choices, wxCB_READONLY );
+ m_combo = new wxComboBox( panel, ID_COMBO, "This", wxPoint(20,25), wxSize(120,-1), 5, choices, wxCB_READONLY );
(void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #2", wxPoint(180,30), wxSize(140,30) );
(void)new wxButton( panel, ID_COMBO_SEL_STR, "Select 'This'", wxPoint(340,30), wxSize(140,30) );
(void)new wxButton( panel, ID_COMBO_CLEAR, "Clear", wxPoint(180,80), wxSize(140,30) );
(void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "Select 'This'", wxPoint(180,80), wxSize(140,30) );
m_fontButton = new wxButton( panel, ID_SET_FONT, "Set more Italic font", wxPoint(340,30), wxSize(140,30) );
(void)new wxButton( panel, ID_RADIOBOX_FONT, "Set Italic font", wxPoint(340,80), wxSize(140,30) );
- (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "Disable", wxPoint(340,130), wxSize(140,30) );
- wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30), wxRB_GROUP );
+ (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "Disable", wxPoint(340,130), wxDefaultSize );
+ wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxDefaultSize, wxRB_GROUP );
rb->SetValue( FALSE );
- (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "Radiobutton2", wxPoint(340,170), wxSize(110,30) );
+ (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "Radiobutton2", wxPoint(340,170), wxDefaultSize );
m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio);
panel = new wxPanel(m_notebook);
(void)new wxBitmapButton(panel, -1, bitmap, wxPoint(100, 20));
+#if 0
+ bitmap = wxBitmap("../../utils/wxPython/tests/bitmaps/test2.bmp",
+ wxBITMAP_TYPE_BMP);
+ bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
+ (void)new wxBitmapButton(panel, -1, bitmap, wxPoint(300, 120));
+#endif
+
wxBitmap bmp1(wxTheApp->GetStdIcon(wxICON_INFORMATION)),
bmp2(wxTheApp->GetStdIcon(wxICON_WARNING)),
bmp3(wxTheApp->GetStdIcon(wxICON_QUESTION));
m_notebook->AddPage(panel, "wxBitmapXXX");
-// --------------- TEST CODE ----------------------
-
- // layout constraints
+ // layout constraints
- panel = new wxPanel(m_notebook);
- panel->SetAutoLayout( TRUE );
-
- wxLayoutConstraints *c;
- c = new wxLayoutConstraints;
- c->top.SameAs( panel, wxTop, 10 );
- c->height.AsIs( );
- c->left.SameAs( panel, wxLeft, 10 );
- c->width.PercentOf( panel, wxWidth, 40 );
-
- wxButton *pMyButton = new wxButton(panel, -1, "Test Button" );
- pMyButton->SetConstraints( c );
+ panel = new wxPanel(m_notebook);
+ panel->SetAutoLayout( TRUE );
- c = new wxLayoutConstraints;
- c->top.SameAs( panel, wxTop, 10 );
- c->bottom.SameAs( panel, wxBottom, 10 );
- c->right.SameAs( panel, wxRight, 10 );
- c->width.PercentOf( panel, wxWidth, 40 );
+ c = new wxLayoutConstraints;
+ c->top.SameAs( panel, wxTop, 10 );
+ c->height.AsIs( );
+ c->left.SameAs( panel, wxLeft, 10 );
+ c->width.PercentOf( panel, wxWidth, 40 );
- wxButton *pMyButton2 = new wxButton(panel, -1, "Test Button 2" );
- pMyButton2->SetConstraints( c );
+ wxButton *pMyButton = new wxButton(panel, -1, "Test Button" );
+ pMyButton->SetConstraints( c );
- m_notebook->AddPage(panel, "wxLayoutConstraint");
+ c = new wxLayoutConstraints;
+ c->top.SameAs( panel, wxTop, 10 );
+ c->bottom.SameAs( panel, wxBottom, 10 );
+ c->right.SameAs( panel, wxRight, 10 );
+ c->width.PercentOf( panel, wxWidth, 40 );
- // sizer
+ wxButton *pMyButton2 = new wxButton(panel, -1, "Test Button 2" );
+ pMyButton2->SetConstraints( c );
- panel = new wxPanel(m_notebook);
- panel->SetAutoLayout( TRUE );
+ m_notebook->AddPage(panel, "wxLayoutConstraint");
- wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
+ // sizer
- sizer->Add( new wxButton(panel, -1, "Test Button" ), 3, wxALL, 10 );
- sizer->Add( 20,20, 1 );
- sizer->Add( new wxButton(panel, -1, "Test Button 2" ), 3, wxGROW|wxALL, 10 );
+ panel = new wxPanel(m_notebook);
+ panel->SetAutoLayout( TRUE );
- panel->SetSizer( sizer );
+ wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
- m_notebook->AddPage(panel, "wxSizer");
+ sizer->Add( new wxButton(panel, -1, "Test Button" ), 3, wxALL, 10 );
+ sizer->Add( 20,20, 1 );
+ sizer->Add( new wxButton(panel, -1, "Test Button 2" ), 3, wxGROW|wxALL, 10 );
-// --------------- TEST CODE ----------------------
+ panel->SetSizer( sizer );
+ m_notebook->AddPage(panel, "wxSizer");
}
void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
SetBackgroundColour(s_colOld);
s_colOld = wxNullColour;
+ m_lbSelectThis->SetForegroundColour("yellow");
m_lbSelectThis->SetBackgroundColour("blue");
}
else
s_colOld = GetBackgroundColour();
SetBackgroundColour("green");
+ m_lbSelectThis->SetForegroundColour("white");
m_lbSelectThis->SetBackgroundColour("red");
}
{
// GetParent()->Move(100, 100);
+ if (event.GetInt() == -1)
+ {
+ m_text->AppendText( "ListBox has no selections anymore\n" );
+ return;
+ }
+
wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
: m_listboxSorted;
wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
m_text->AppendText( "ListBox event client data string is: '" );
if (obj) // BC++ doesn't like use of '? .. : .. ' in this context
- m_text->AppendText( obj->GetData() );
+ m_text->AppendText( obj->GetData() );
else
- m_text->AppendText( wxString("none") );
+ m_text->AppendText( wxString("none") );
m_text->AppendText( "'\n" );
m_text->AppendText( "ListBox control client data string is: '" );
obj = (wxStringClientData *)listbox->GetClientObject(listbox->GetSelection());
if (obj)
- m_text->AppendText( obj->GetData() );
+ m_text->AppendText( obj->GetData() );
else
- m_text->AppendText( wxString("none") );
+ m_text->AppendText( wxString("none") );
m_text->AppendText( "'\n" );
}
cb->SetToolTip( "Click to disable listbox" );
#endif // wxUSE_TOOLTIPS
m_listbox->Enable( event.GetInt() == 0 );
+ m_lbSelectThis->Enable( event.GetInt() == 0 );
+ m_lbSelectNum->Enable( event.GetInt() == 0 );
m_listboxSorted->Enable( event.GetInt() == 0 );
break;
}
#if wxUSE_SPINCTRL
-void MyPanel::OnSpinCtrl(wxSpinEvent& event)
+void MyPanel::OnSpinCtrl(wxCommandEvent& event)
{
wxString s;
- s.Printf(_T("Current value of spin ctrl is %d\n"), m_spinctrl->GetValue());
+ s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),
+ m_spinctrl->GetValue(), event.GetInt());
m_text->AppendText(s);
}
projects / wxWidgets.git / blobdiff