fixed the status of the second radio button; now (on wxGTK at least) it appears corre...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/screenshotgen/src/guidesign.fbp b/utils/screenshotgen/src/guidesign.fbp
index 00e0a5b4f712c665ff7d9f0c5a0794da910b104c..6cb2d47a4b2a5817b0298ce0a511c2c3ba63bf32 100644 (file)
--- a/utils/screenshotgen/src/guidesign.fbp
+++ b/utils/screenshotgen/src/guidesign.fbp
@@ -577,7 +577,7 @@
                                             <property name="permission">protected</property>
                                             <property name="pos"></property>
                                             <property name="size"></property>
                                             <property name="permission">protected</property>
                                             <property name="pos"></property>
                                             <property name="size"></property>

-                                            <property name="style"></property>
+                                            <property name="style">wxRB_GROUP</property>

                                             <property name="subclass"></property>
                                             <property name="tooltip">wxRadioButton</property>
                                             <property name="value">1</property>
                                             <property name="subclass"></property>
                                             <property name="tooltip">wxRadioButton</property>
                                             <property name="value">1</property>

diff --git a/utils/screenshotgen/src/guiframe.cpp b/utils/screenshotgen/src/guiframe.cpp
index 5f1b4ddd0e1fd4847617d5088b50885bf1c9174e..5244014005dd6ec305fb207df27a24a204a21773 100644 (file)
--- a/utils/screenshotgen/src/guiframe.cpp
+++ b/utils/screenshotgen/src/guiframe.cpp
@@ -116,7 +116,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
        
        fgSizer1->Add( m_checkBox2, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 20 );
        
        
        fgSizer1->Add( m_checkBox2, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 20 );
        

-       m_radioBtn1 = new wxRadioButton( m_panel1, wxID_ANY, _("Checked"), wxDefaultPosition, wxDefaultSize, 0 );
+       m_radioBtn1 = new wxRadioButton( m_panel1, wxID_ANY, _("Checked"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );

        m_radioBtn1->SetValue( true ); 
        m_radioBtn1->SetToolTip( _("wxRadioButton") );
        
        m_radioBtn1->SetValue( true ); 
        m_radioBtn1->SetToolTip( _("wxRadioButton") );
        

diff --git a/utils/screenshotgen/src/screenshot_main.cpp b/utils/screenshotgen/src/screenshot_main.cpp
index a8697bdbae959dbf480a57948e6e177770227e5e..02c3ef537511c23a087a07681e3c0a5bff7d93d9 100644 (file)
--- a/utils/screenshotgen/src/screenshot_main.cpp
+++ b/utils/screenshotgen/src/screenshot_main.cpp
@@ -77,12 +77,14 @@ ScreenshotFrame::~ScreenshotFrame()
     e.g. you cannot load a richtext file in a wxRichtextCtrl during initialization.
 
     Those customizations will be done here.
     e.g. you cannot load a richtext file in a wxRichtextCtrl during initialization.
 
     Those customizations will be done here.

+
+
+    NB: under wxGTK for the radio button "unchecked" to be unchecked, it's
+        important to put the wxRB_GROUP style on the first wxRadioButton
+        (the one "checked") and no flags on the second one.

 */
 void ScreenshotFrame::InitFBControls()
 {
 */
 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);
 
     // For some reason, wxFormBuilder does not set the scrollbar range
     m_scrollBar1->SetScrollbar(50, 1, 100, 1);