X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17fb35240e1f195412272043a6416ec0fc150690..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/palmos/radiobox.h?ds=inline

diff --git a/include/wx/palmos/radiobox.h b/include/wx/palmos/radiobox.h
index 39640d620c..d77fce4bfe 100644
--- a/include/wx/palmos/radiobox.h
+++ b/include/wx/palmos/radiobox.h
@@ -12,18 +12,14 @@
 #ifndef _WX_RADIOBOX_H_
 #define _WX_RADIOBOX_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "radiobox.h"
-#endif
-
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxRadioButton;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxRadioButton;
 
 // ----------------------------------------------------------------------------
 // wxRadioBox
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
+class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase
 {
 public:
     wxRadioBox():m_radios(wxKEY_INTEGER,32)
@@ -65,7 +61,7 @@ public:
                      style, val, name);
     }
 
-    ~wxRadioBox();
+    virtual ~wxRadioBox();
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -89,25 +85,34 @@ public:
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
-    // implement the radiobox interface
-    virtual void SetSelection(int n);
-    virtual int GetSelection() const;
-    virtual int GetCount() const;
-    virtual wxString GetString(int n) const;
-    virtual void SetString(int n, const wxString& label);
-
+    // Enabling
     virtual bool Enable(bool enable = true);
-    virtual bool Enable(int n, 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(int n, 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;
+    virtual unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& label);
 
     virtual void SetLabel(const wxString& label);
     virtual wxString GetLabel();
 
-    virtual int GetColumnCount() const;
-    virtual int GetRowCount() const;
-
     virtual void DoGetPosition( int *x, int *y ) const;
     virtual void DoGetSize( int *width, int *height ) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
@@ -133,30 +138,18 @@ public:
 
     void SendNotificationEvent();
 
-    // get the number of buttons per column/row
-    int GetNumVer() const;
-    int GetNumHor() const;
-
-    virtual void ApplyParentThemeBackground(const wxColour& bg)
-        { SetBackgroundColour(bg); }
-
 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 total size occupied by the radio box buttons
     wxSize GetTotalButtonSize(const wxSize& sizeBtn) const;
 
-    int               m_majorDim;
-    int *             m_radioWidth;  // for bitmaps
-    int *             m_radioHeight;
+    int *m_radioWidth;  // for bitmaps
+    int *m_radioHeight;
 
-    int               m_noItems;
-    int               m_noRowsOrCols;
-    int               m_selectedButton;
+    int  m_noRowsOrCols;
+    int  m_selectedButton;
 
     virtual wxSize DoGetBestSize() const;
 
@@ -170,7 +163,7 @@ private:
     wxHashTable m_radios;
 
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
-    DECLARE_NO_COPY_CLASS(wxRadioBox)
+    wxDECLARE_NO_COPY_CLASS(wxRadioBox);
 };
 
 #endif