make wxNO_BORDER work with wxRadioBox (patch 1525406)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index f0db5e28aae1936ffbbbe449b80ae98988d6e37a..39627c09e589044c6fda35731760c7b9e74b8fdc 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -118,6 +118,10 @@ wxMSW:
 - Corrected GetChecked() for events from checkable menu items (smanders)
 - Fixed popup menus under Windows NT 4
 
+wxGTK:
+
+- Fix wxNO_BORDER style for wxRadioBox (David Hart)
+
 
 2.8.3
 -----

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 938fe515ca061bb7452faca17e9d88b033585244..e84d215469fbda5c7e65c52463dd0f1e2aa8cb42 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -253,6 +253,12 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     m_widget = GTKCreateFrame(title);
     wxControl::SetLabel(title);
+    if ( HasFlag(wxNO_BORDER) )
+    {
+        // If we don't do this here, the wxNO_BORDER style is ignored in Show()
+        gtk_frame_set_shadow_type(GTK_FRAME(m_widget), GTK_SHADOW_NONE);
+    }
+
 
     // majorDim may be 0 if all trailing parameters were omitted, so don't
     // assert here but just use the correct value for it

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index f969e6e4d17a2c9dcb6d260118f78e6b7ecfc250..2f760c38cff3f27d60c8297839cf360a5e9ec1f9 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -202,6 +202,11 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     m_widget = gtk_frame_new(NULL);
     SetLabel(title);
+    if ( HasFlag(wxNO_BORDER) )
+    {
+        // If we don't do this here, the wxNO_BORDER style is ignored in Show()
+        gtk_frame_set_shadow_type(GTK_FRAME(m_widget), GTK_SHADOW_NONE);
+    }
 
     // majorDim may be 0 if all trailing parameters were omitted, so don't
     // assert here but just use the correct value for it