Added __WXMAC_OSX__ guards around the CFRunLoop calls, CFRunLoop not available on...

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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 7f27104b4089f393ed0c490c246ca12d35a6aa75..e9bd2dfbadc37b6316f13bc9bbba4d4b0d3347ff 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -9,43 +9,72 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_RADIOBOX_H_
-#define _WX_RADIOBOX_H_
+#ifndef _WX_MOTIF_RADIOBOX_H_
+#define _WX_MOTIF_RADIOBOX_H_

 
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "radiobox.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "radiobox.h"

 #endif
 
 #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_PTR(WXWidget, wxWidgetArray);
+#endif // wxWIDGET_ARRAY_DEFINED

 
 

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

 
 class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
 {
 
 class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
 {

-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
-

 public:
 public:

-    wxRadioBox();
+    wxRadioBox() { Init(); }

 
     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 = 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)

     {
     {

-        Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
+        Init();
+
+        Create(parent, id, title, pos, size, n, choices,
+               majorDim, style, val, name);
+    }
+
+    wxRadioBox(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)
+    {
+        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);


@@ -53,10 +82,10 @@ public:
 
     void SetString(int item, const wxString& label) ;
     wxString GetString(int item) const;
 
     void SetString(int item, const wxString& label) ;
     wxString GetString(int item) const;

-    virtual bool Enable(bool enable = TRUE);
-    void Enable(int item, bool enable);
-    void Show(int item, bool show) ;
-    virtual bool Show(bool show = TRUE) ;
+    virtual bool Enable(bool enable = true);
+    virtual bool Enable(int item, bool enable = true);
+    virtual bool Show(int item, bool show = true);
+    virtual bool Show(bool show = true);

 
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection(const wxString& s);
 
     virtual wxString GetStringSelection() const;
     virtual bool SetStringSelection(const wxString& s);


@@ -70,27 +99,32 @@ public:
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     // Implementation
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     // Implementation

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);

     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();

-    WXWidget* GetRadioButtons() const { return m_radioButtons; }
+    const wxWidgetArray& GetRadioButtons() const { return m_radioButtons; }

     void SetSel(int i) { m_selectedButton = i; }
     virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
 
 protected:
     void SetSel(int i) { m_selectedButton = i; }
     virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
 
 protected:

+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+

     int               m_majorDim;
     int               m_noItems;
     int               m_noRowsOrCols;
     int               m_selectedButton;
 
     int               m_majorDim;
     int               m_noItems;
     int               m_noRowsOrCols;
     int               m_selectedButton;
 

-    WXWidget*         m_radioButtons;
+    wxWidgetArray     m_radioButtons;

     WXWidget          m_labelWidget;
     WXWidget          m_labelWidget;

-    wxString*         m_radioButtonLabels;
+    wxArrayString     m_radioButtonLabels;

 
 

-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
+private:
+    void Init();
+
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)

 };
 
 };
 

-#endif
-// _WX_RADIOBOX_H_
+#endif // _WX_MOTIF_RADIOBOX_H_
+