From 0bb624217291063ab5d86f14bfe2087fd6ffcaa5 Mon Sep 17 00:00:00 2001 From: George Tasker Date: Wed, 7 Feb 2001 16:27:21 +0000 Subject: [PATCH] Radiobox control was being created with wxComboBoxNameStr instead of wxRadioBoxNameStr. Widgets on the GAUGE tab were overlapping each other, so I slightly rearranged them to not overlap. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/controls/controls.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index fb96480ea7..a0fdff2457 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -256,7 +256,7 @@ public: int majorDim = 1, long style = wxRA_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) + const wxString& name = wxRadioBoxNameStr) : wxRadioBox(parent, id, title, pos, size, n, choices, majorDim, style, validator, name) { } @@ -691,15 +691,15 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio); panel = new wxPanel(m_notebook); - (void)new wxStaticBox( panel, -1, "&wxGauge and wxSlider", wxPoint(10,10), wxSize(220,130) ); + (void)new wxStaticBox( panel, -1, "&wxGauge and wxSlider", wxPoint(10,10), wxSize(222,130) ); m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER ); m_gauge->SetBackgroundColour(*wxGREEN); m_gauge->SetForegroundColour(*wxRED); m_gaugeVert = new wxGauge( panel, -1, 100, - wxPoint(180,35), wxSize(30, 90), + wxPoint(195,35), wxSize(30, 90), wxGA_VERTICAL | wxGA_SMOOTH | wxNO_BORDER ); m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxPoint(18,90), wxSize(155,-1), wxSL_LABELS ); - (void)new wxStaticBox( panel, -1, "&Explanation", wxPoint(220,10), wxSize(270,130) ); + (void)new wxStaticBox( panel, -1, "&Explanation", wxPoint(230,10), wxSize(270,130) ); #ifdef __WXMOTIF__ // No wrapping text in wxStaticText yet :-( (void)new wxStaticText( panel, -1, -- 2.45.2