Add virtual keyword where applicable.

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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index d1e91a0bfc727c0ea7f09434efaba6713bb4ab4d..1e4085f911325a3812a2bcc071bf5ed004fb6dee 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        radiobox.h
+// Name:        wx/motif/radiobox.h

 // Purpose:     wxRadioBox class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxRadioBox class
 // Author:      Julian Smart
 // Modified by:


@@ -9,26 +9,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_RADIOBOX_H_
-#define _WX_RADIOBOX_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "radiobox.h"
-#endif
+#ifndef _WX_MOTIF_RADIOBOX_H_
+#define _WX_MOTIF_RADIOBOX_H_

 
 #ifndef wxWIDGET_ARRAY_DEFINED
     #define wxWIDGET_ARRAY_DEFINED
 
     #include "wx/dynarray.h"
 
 #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
 {
 
 #include "wx/arrstr.h"
 
 class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
 {

-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
-

 public:
     wxRadioBox() { Init(); }
 
 public:
     wxRadioBox() { Init(); }
 


@@ -78,42 +72,52 @@ public:
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 

-    int FindString(const wxString& s) const;
-    void SetSelection(int N);
+    // Enabling
+    virtual bool Enable(bool enable = true);
+    virtual bool Enable(unsigned int item, bool enable = true);
+    virtual bool IsItemEnabled(unsigned int WXUNUSED(n)) const
+    {
+        /* TODO */
+        return true;
+    }
+
+    // Showing
+    virtual bool Show(bool show = true);
+    virtual bool Show(unsigned int item, bool show = true);
+    virtual bool IsItemShown(unsigned int WXUNUSED(n)) const
+    {
+        /* TODO */
+        return true;
+    }
+
+    virtual void SetSelection(int n);

     int GetSelection() const;
 
     int GetSelection() 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 void SetString(unsigned int item, const wxString& label);
+    virtual wxString GetString(unsigned int item) const;

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

-    virtual int GetCount() const { return m_noItems; } ;
+    virtual unsigned int GetCount() const { return m_noItems; } ;

     void Command(wxCommandEvent& event);
 
     void Command(wxCommandEvent& event);
 

-    int GetColumnCount() const;
-    int GetRowCount() const;
-

     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
 
     // Implementation
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     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; }
 
     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:
 protected:

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

     int               m_noRowsOrCols;
     int               m_selectedButton;
 
     int               m_noRowsOrCols;
     int               m_selectedButton;
 


@@ -121,10 +125,10 @@ protected:
     WXWidget          m_labelWidget;
     wxArrayString     m_radioButtonLabels;
 
     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_