X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45e41c05e477fef0c1333c2696366eec7db0bae4..a3c1786def55bcc233f9606acb1aceee956d184f:/samples/controls/controls.cpp diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index 4b010ed6f3..bd43837570 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -427,7 +427,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) 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) ); + wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxSize(110,30), wxRB_GROUP ); rb->SetValue( FALSE ); (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "Radiobutton2", wxPoint(340,170), wxSize(110,30) ); m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio); @@ -491,6 +491,8 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) ); bmpBtn = NULL; // suppress warning + new wxButton(panel, -1, "Another button", wxPoint(250, 20)); + m_notebook->AddPage(panel, "wxBitmapXXX"); } @@ -776,7 +778,7 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) ) max, // range this, // parent wxPD_CAN_ABORT | wxPD_APP_MODAL | wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | wxPD_REMAINING_TIME); - + bool cont = TRUE; for ( int i = 0; i < max && cont; i++ )