X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a727a3bb8d1ea77ef561b6fa4af05c7b5602595..cf0cf17b0058bca4f7144b474a906d73b4fd06ef:/include/wx/palmos/radiobox.h?ds=sidebyside

diff --git a/include/wx/palmos/radiobox.h b/include/wx/palmos/radiobox.h
index 11eef5e47f..39640d620c 100644
--- a/include/wx/palmos/radiobox.h
+++ b/include/wx/palmos/radiobox.h
@@ -17,6 +17,7 @@
 #endif
 
 class WXDLLEXPORT wxBitmap;
+class WXDLLEXPORT wxRadioButton;
 
 // ----------------------------------------------------------------------------
 // wxRadioBox
@@ -25,7 +26,10 @@ class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
 {
 public:
-    wxRadioBox();
+    wxRadioBox():m_radios(wxKEY_INTEGER,32)
+    {
+        Init();
+    }
 
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
@@ -34,13 +38,16 @@ public:
                const wxSize& size = wxDefaultSize,
                int n = 0, const wxString choices[] = NULL,
                int majorDim = 0,
-               long style = wxRA_HORIZONTAL,
+               long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
+              :m_radios(wxKEY_INTEGER,n+1)
     {
+        Init();
         (void)Create(parent, id, title, pos, size, n, choices, majorDim,
                      style, val, name);
     }
+
     wxRadioBox(wxWindow *parent,
                wxWindowID id,
                const wxString& title,
@@ -48,10 +55,12 @@ public:
                const wxSize& size,
                const wxArrayString& choices,
                int majorDim = 0,
-               long style = wxRA_HORIZONTAL,
+               long style = wxRA_SPECIFY_COLS,
                const wxValidator& val = wxDefaultValidator,
                const wxString& name = wxRadioBoxNameStr)
+              :m_radios(wxKEY_INTEGER,choices.GetCount()+1)
     {
+        Init();
         (void)Create(parent, id, title, pos, size, choices, majorDim,
                      style, val, name);
     }
@@ -65,7 +74,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 int n = 0, const wxString choices[] = NULL,
                 int majorDim = 0,
-                long style = wxRA_HORIZONTAL,
+                long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
@@ -76,7 +85,7 @@ public:
                 const wxSize& size,
                 const wxArrayString& choices,
                 int majorDim = 0,
-                long style = wxRA_HORIZONTAL,
+                long style = wxRA_SPECIFY_COLS,
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxRadioBoxNameStr);
 
@@ -86,17 +95,32 @@ public:
     virtual int GetCount() const;
     virtual wxString GetString(int n) const;
     virtual void SetString(int n, const wxString& label);
-    virtual void Enable(int n, bool enable = true);
-    virtual void Show(int n, bool show = true);
+
+    virtual bool Enable(bool enable = true);
+    virtual bool Enable(int n, bool enable = true);
+
+    virtual bool Show(bool show = true);
+    virtual bool Show(int n, bool show = true);
+
+    virtual void SetLabel(const wxString& label);
+    virtual wxString GetLabel();
+
     virtual int GetColumnCount() const;
     virtual int GetRowCount() const;
 
-    virtual bool Show(bool show = true);
+    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);
+
+    virtual wxPoint GetClientAreaOrigin() const;
+
     void SetFocus();
-    virtual bool Enable(bool enable = true);
     void SetLabelFont(const wxFont& WXUNUSED(font)) {};
     void SetButtonFont(const wxFont& font) { SetFont(font); }
 
+    virtual void Refresh( bool eraseBackground = true,
+                          const wxRect *rect = NULL );
+
     void Command(wxCommandEvent& event);
 
     int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
@@ -134,12 +158,17 @@ protected:
     int               m_noRowsOrCols;
     int               m_selectedButton;
 
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
     virtual wxSize DoGetBestSize() const;
 
 private:
+
+    void Init();
+    wxRadioButton *GetRadioButton(int i) const;
+
+    wxPoint m_pos;
+    wxSize m_size;
+    wxHashTable m_radios;
+
     DECLARE_DYNAMIC_CLASS(wxRadioBox)
     DECLARE_NO_COPY_CLASS(wxRadioBox)
 };