FIxed wxRadioBox::Get/SetLabel.

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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index bf7c100c4616f875e8c4fef5aa252ce86096c76e..a47c3a5c4633dae1ccb8e9894d11b30321cfad04 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -73,8 +73,9 @@ public:
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();

-    inline WXWidget* GetRadioButtons() const { return m_radioButtons; }
-    inline void SetSel(int i) { m_selectedButton = i; }
+    WXWidget* GetRadioButtons() const { return m_radioButtons; }
+    void SetSel(int i) { m_selectedButton = i; }
+    virtual WXWidget GetLabelWidget() const { return m_labelWidget; }

 
 protected:
     int               m_majorDim;
 
 protected:
     int               m_majorDim;


@@ -83,6 +84,7 @@ protected:
     int               m_selectedButton;
 
     WXWidget*         m_radioButtons;
     int               m_selectedButton;
 
     WXWidget*         m_radioButtons;

+    WXWidget          m_labelWidget;

     wxString*         m_radioButtonLabels;
 
     virtual void DoSetSize(int x, int y,
     wxString*         m_radioButtonLabels;
 
     virtual void DoSetSize(int x, int y,

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 98368633fc2cb61c6c1f1701dbeaff2880ba0e54..6659d3d324a9701d56e8c2b683a7fd9ca3cd5f93 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -102,7 +102,8 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
     if (label1 != "")
     {
         wxXmString text(label1);
     if (label1 != "")
     {
         wxXmString text(label1);

-        (void)XtVaCreateManagedWidget( label1.c_str(),
+        m_labelWidget = (WXWidget)
+            XtVaCreateManagedWidget( label1.c_str(),

 #if wxUSE_GADGETS
                                        style & wxCOLOURED ? xmLabelWidgetClass
                                                           : xmLabelGadgetClass,
 #if wxUSE_GADGETS
                                        style & wxCOLOURED ? xmLabelWidgetClass
                                                           : xmLabelGadgetClass,