From cf490c4df9c2a706e92c1ec39128a368b2a4e7b8 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Tue, 7 Oct 2008 17:22:26 +0000 Subject: [PATCH] removed duplicated row of bitmap buttons added for error git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/screenshotgen/src/guidesign.fbp | 118 +------------------- utils/screenshotgen/src/guiframe.cpp | 18 +-- utils/screenshotgen/src/guiframe.h | 2 - utils/screenshotgen/src/screenshot_main.cpp | 3 + 4 files changed, 7 insertions(+), 134 deletions(-) diff --git a/utils/screenshotgen/src/guidesign.fbp b/utils/screenshotgen/src/guidesign.fbp index a1df187060..00e0a5b4f7 100644 --- a/utils/screenshotgen/src/guidesign.fbp +++ b/utils/screenshotgen/src/guidesign.fbp @@ -296,7 +296,7 @@ Tiny Controls - 0 + 1 @@ -768,120 +768,6 @@ - - 5 - wxALIGN_CENTER|wxALL - 0 - - - bitmaps/wxwin32x32.png; Load From File - - 0 - - 1 - - - - 0 - - wxID_ANY - wxBitmapButton - - - m_bpButton12 - protected - - - - wxBU_AUTODRAW - - wxBitmapButton - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER|wxALL - 0 - - - bitmaps/wxwin32x32.png; Load From File - - 0 - - 1 - - - - 0 - - wxID_ANY - wxBitmapButton - - - m_bpButton11 - protected - - - - wxBU_AUTODRAW - - wxBitmapButton - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 20 wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND @@ -1348,7 +1234,7 @@ Multiple choice Controls - 1 + 0 diff --git a/utils/screenshotgen/src/guiframe.cpp b/utils/screenshotgen/src/guiframe.cpp index b2885382ca..5f1b4ddd0e 100644 --- a/utils/screenshotgen/src/guiframe.cpp +++ b/utils/screenshotgen/src/guiframe.cpp @@ -139,20 +139,6 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons fgSizer1->Add( m_bitmap1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 20 ); - m_bpButton12 = new wxBitmapButton( m_panel1, wxID_ANY, wxBitmap( wxT("bitmaps/wxwin32x32.png"), wxBITMAP_TYPE_ANY ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - m_bpButton12->SetToolTip( _("wxBitmapButton") ); - - m_bpButton12->SetToolTip( _("wxBitmapButton") ); - - fgSizer1->Add( m_bpButton12, 0, wxALIGN_CENTER|wxALL, 5 ); - - m_bpButton11 = new wxBitmapButton( m_panel1, wxID_ANY, wxBitmap( wxT("bitmaps/wxwin32x32.png"), wxBITMAP_TYPE_ANY ), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); - m_bpButton11->SetToolTip( _("wxBitmapButton") ); - - m_bpButton11->SetToolTip( _("wxBitmapButton") ); - - fgSizer1->Add( m_bpButton11, 0, wxALIGN_CENTER|wxALL, 5 ); - m_gauge1 = new wxGauge( m_panel1, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL, wxDefaultValidator, wxT("_Gauge") ); m_gauge1->SetValue( 50 ); m_gauge1->SetToolTip( _("wxGauge") ); @@ -198,7 +184,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons m_panel1->SetSizer( fgSizer1 ); m_panel1->Layout(); fgSizer1->Fit( m_panel1 ); - m_notebook1->AddPage( m_panel1, _("Tiny Controls"), false ); + m_notebook1->AddPage( m_panel1, _("Tiny Controls"), true ); m_panel2 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer2; fgSizer2 = new wxFlexGridSizer( 5, 2, 0, 0 ); @@ -274,7 +260,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons m_panel2->SetSizer( fgSizer2 ); m_panel2->Layout(); fgSizer2->Fit( m_panel2 ); - m_notebook1->AddPage( m_panel2, _("Multiple choice Controls"), true ); + m_notebook1->AddPage( m_panel2, _("Multiple choice Controls"), false ); m_panel3 = new wxPanel( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer2; bSizer2 = new wxBoxSizer( wxVERTICAL ); diff --git a/utils/screenshotgen/src/guiframe.h b/utils/screenshotgen/src/guiframe.h index 40d3bfed0a..89105a1e62 100644 --- a/utils/screenshotgen/src/guiframe.h +++ b/utils/screenshotgen/src/guiframe.h @@ -91,8 +91,6 @@ class GUIFrame : public wxFrame wxRadioButton* m_radioBtn2; wxBitmapButton* m_bpButton1; wxStaticBitmap* m_bitmap1; - wxBitmapButton* m_bpButton12; - wxBitmapButton* m_bpButton11; wxGauge* m_gauge1; wxSlider* m_slider1; wxToggleButton* m_toggleBtn1; diff --git a/utils/screenshotgen/src/screenshot_main.cpp b/utils/screenshotgen/src/screenshot_main.cpp index 2994deb5bc..a8697bdbae 100644 --- a/utils/screenshotgen/src/screenshot_main.cpp +++ b/utils/screenshotgen/src/screenshot_main.cpp @@ -80,6 +80,9 @@ ScreenshotFrame::~ScreenshotFrame() */ void ScreenshotFrame::InitFBControls() { + // explicitely uncheck radio button: + m_radioBtn2->SetValue(false); + // For some reason, wxFormBuilder does not set the scrollbar range m_scrollBar1->SetScrollbar(50, 1, 100, 1); -- 2.45.2