X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..ec8565f3c5d1df72267cb1e3375789090ac091da:/include/wx/motif/radiobox.h

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 6d6f262e3f..e9bd2dfbad 100644
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -6,29 +6,27 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets 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(NO_GCC_PRAGMA)
-#pragma interface "radiobox.h"
+    #pragma interface "radiobox.h"
 #endif
 
 #ifndef wxWIDGET_ARRAY_DEFINED
     #define wxWIDGET_ARRAY_DEFINED
 
     #include "wx/dynarray.h"
-    WX_DEFINE_ARRAY(WXWidget, wxWidgetArray);
-#endif
+    WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);
+#endif // wxWIDGET_ARRAY_DEFINED
 
 #include "wx/arrstr.h"
 
 class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
 {
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
-
 public:
     wxRadioBox() { Init(); }
 
@@ -84,10 +82,10 @@ public:
 
     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);
@@ -101,17 +99,18 @@ public:
     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();
     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:
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
     int               m_majorDim;
     int               m_noItems;
     int               m_noRowsOrCols;
@@ -121,10 +120,11 @@ protected:
     WXWidget          m_labelWidget;
     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_
+