Better fix

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

diff --git a/include/wx/palmos/radiobox.h b/include/wx/palmos/radiobox.h
index 16cccd278daa0c541cb1c1a25ae62ee723f29f00..4b34521de588b00b1d150937fb971baee8d2ead0 100644 (file)
--- a/include/wx/palmos/radiobox.h
+++ b/include/wx/palmos/radiobox.h
@@ -12,8 +12,8 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 

-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxRadioButton;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxRadioButton;

 
 // ----------------------------------------------------------------------------
 // wxRadioBox
 
 // ----------------------------------------------------------------------------
 // wxRadioBox


@@ -61,7 +61,7 @@ public:
                      style, val, name);
     }
 
                      style, val, name);
     }
 

-    ~wxRadioBox();
+    virtual ~wxRadioBox();

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -85,6 +85,24 @@ public:
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 

+    // Enabling
+    virtual bool Enable(bool enable = true);
+    virtual bool Enable(unsigned int n, 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 n, bool show = true);
+    virtual bool IsItemShown(unsigned int WXUNUSED(n)) const
+    {
+        /* TODO */
+        return true;
+    }
+

     // implement the radiobox interface
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
     // implement the radiobox interface
     virtual void SetSelection(int n);
     virtual int GetSelection() const;


@@ -92,12 +110,6 @@ public:
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& label);
 
     virtual wxString GetString(unsigned int n) const;
     virtual void SetString(unsigned int n, const wxString& label);
 

-    virtual bool Enable(bool enable = true);
-    virtual bool Enable(unsigned int n, bool enable = true);
-
-    virtual bool Show(bool show = true);
-    virtual bool Show(unsigned int n, bool show = true);
-

     virtual void SetLabel(const wxString& label);
     virtual wxString GetLabel();
 
     virtual void SetLabel(const wxString& label);
     virtual wxString GetLabel();
 


@@ -127,9 +139,6 @@ public:
     void SendNotificationEvent();
 
 protected:
     void SendNotificationEvent();
 
 protected:

-    // we can't compute our best size before the items are added to the control
-    virtual void SetInitialBestSize(const wxSize& WXUNUSED(size)) { }
-

     // get the max size of radio buttons
     wxSize GetMaxButtonSize() const;
 
     // get the max size of radio buttons
     wxSize GetMaxButtonSize() const;