Don't infinitely recurse when setting the child focus. Without

[wxWidgets.git] / include / wx / motif / radiobox.h

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index bf7c100c4616f875e8c4fef5aa252ce86096c76e..d1e91a0bfc727c0ea7f09434efaba6713bb4ab4d 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -12,40 +12,71 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "radiobox.h"
 #endif
 
 #pragma interface "radiobox.h"
 #endif
 

-#include "wx/control.h"
+#ifndef wxWIDGET_ARRAY_DEFINED
+    #define wxWIDGET_ARRAY_DEFINED

 
 

-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
+    #include "wx/dynarray.h"
+    WX_DEFINE_ARRAY(WXWidget, wxWidgetArray);
+#endif

 
 

-// List box item
-class WXDLLEXPORT wxBitmap ;
+#include "wx/arrstr.h"

 
 class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
 {
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 
 public:
 
 class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
 {
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
 
 public:

-    wxRadioBox();
+    wxRadioBox() { Init(); }
+
+    wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int n = 0, const wxString choices[] = NULL,
+               int majorDim = 0, long style = wxRA_HORIZONTAL,
+               const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr)
+    {
+        Init();
+
+        Create(parent, id, title, pos, size, n, choices,
+               majorDim, style, val, name);
+    }

 
     wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
 
     wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,

-        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-        int n = 0, const wxString choices[] = NULL,
-        int majorDim = 0, long style = wxRA_HORIZONTAL,
-        const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               int majorDim = 0, long style = wxRA_HORIZONTAL,
+               const wxValidator& val = wxDefaultValidator,
+               const wxString& name = wxRadioBoxNameStr)

     {
     {

-        Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
+        Init();
+
+        Create(parent, id, title, pos, size, choices,
+               majorDim, style, val, name);

     }
 
     ~wxRadioBox();
 
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
     }
 
     ~wxRadioBox();
 
     bool Create(wxWindow *parent, wxWindowID id, const wxString& title,

-        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-        int n = 0, const wxString choices[] = NULL,
-        int majorDim = 0, long style = wxRA_HORIZONTAL,
-        const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0, const wxString choices[] = NULL,
+                int majorDim = 0, long style = wxRA_HORIZONTAL,
+                const wxValidator& val = wxDefaultValidator,
+                const wxString& name = wxRadioBoxNameStr);
+
+    bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                int majorDim = 0, long style = wxRA_HORIZONTAL,
+                const wxValidator& val = wxDefaultValidator,
+                const wxString& name = wxRadioBoxNameStr);

 
     int FindString(const wxString& s) const;
     void SetSelection(int N);
 
     int FindString(const wxString& s) const;
     void SetSelection(int N);


@@ -73,8 +104,12 @@ 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; }
+    const wxWidgetArray& GetRadioButtons() const { return m_radioButtons; }
+    void SetSel(int i) { m_selectedButton = i; }
+    virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
+
+private:
+    void Init();

 
 protected:
     int               m_majorDim;
 
 protected:
     int               m_majorDim;


@@ -82,8 +117,9 @@ protected:
     int               m_noRowsOrCols;
     int               m_selectedButton;
 
     int               m_noRowsOrCols;
     int               m_selectedButton;
 

-    WXWidget*         m_radioButtons;
-    wxString*         m_radioButtonLabels;
+    wxWidgetArray     m_radioButtons;
+    WXWidget          m_labelWidget;
+    wxArrayString     m_radioButtonLabels;

 
     virtual void DoSetSize(int x, int y,
         int width, int height,
 
     virtual void DoSetSize(int x, int y,
         int width, int height,