Committing in .

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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 23f853f25e8bda414b5ecc45c029e07ae1ee41fc..591f88e21c4d398c393969b3d2d52a83e0fbffce 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -25,16 +25,16 @@ class WXDLLEXPORT wxBitmap ;
 
 class WXDLLEXPORT wxRadioBox : public wxControl
 {
 
 class WXDLLEXPORT wxRadioBox : public wxControl
 {

-DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)

 
 public:
     wxRadioBox();
 
     wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
 
 public:
     wxRadioBox();
 
     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);
     }
     {
         Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
     }


@@ -42,10 +42,10 @@ public:
     ~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);

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


@@ -56,14 +56,14 @@ public:
     void SetLabel(int item, const wxString& label) ;
     wxString GetLabel(int item) const;
     wxString GetLabel() const { return wxControl::GetLabel(); };
     void SetLabel(int item, const wxString& label) ;
     wxString GetLabel(int item) const;
     wxString GetLabel() const { return wxControl::GetLabel(); };

-    bool Enable(bool enable);
+    virtual bool Enable(bool enable = TRUE);

     void Enable(int item, bool enable);
     void Show(int item, bool show) ;
     void Enable(int item, bool enable);
     void Show(int item, bool show) ;

-    bool Show(bool show) ;
+    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);

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

     void Command(wxCommandEvent& event);
 
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
     void Command(wxCommandEvent& event);
 
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }


@@ -92,9 +92,9 @@ protected:
     wxString*         m_radioButtonLabels;
 
     virtual void DoSetSize(int x, int y,
     wxString*         m_radioButtonLabels;
 
     virtual void DoSetSize(int x, int y,

-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);

 };
 
 #endif
 };
 
 #endif

-    // _WX_RADIOBOX_H_
+// _WX_RADIOBOX_H_