Toolbar/tooltip udates

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

diff --git a/include/wx/mac/radiobox.h b/include/wx/mac/radiobox.h
index cb7c5ba405b0d9c353e39f5b08f51d58bbff5917..21910dc6f917d134512365dcea91f0d39a7ec713 100644 (file)
--- a/include/wx/mac/radiobox.h
+++ b/include/wx/mac/radiobox.h
@@ -16,72 +16,76 @@
 #pragma interface "radiobox.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxRadioBoxNameStr;
-
 // List box item
 class WXDLLEXPORT wxBitmap ;
 
-class WXDLLEXPORT wxRadioBox: public wxControl
+class WXDLLEXPORT wxRadioButton ;
+
+class WXDLLEXPORT wxRadioBox: public wxControl, public wxRadioBoxBase
 {
-  DECLARE_DYNAMIC_CLASS(wxRadioBox)
+       DECLARE_DYNAMIC_CLASS(wxRadioBox)
 public:
-  wxRadioBox();
-
-  inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
+// Constructors & destructor
+       wxRadioBox();
+       inline 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)
-  {
-    Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
-  }
-
-  ~wxRadioBox();
-
-  bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
+               {
+                       Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
+               }
+       ~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);
 
-  int FindString(const wxString& s) const;
-  void SetSelection(int N);
-  int GetSelection() const;
-  wxString GetString(int N) const;
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void GetSize(int *x, int *y) const;
-  void GetPosition(int *x, int *y) const;
-  wxString GetLabel() const;
-  void SetLabel(const wxString& label);
-  void SetLabel(int item, const wxString& label) ;
-  wxString GetLabel(int item) const;
-  bool Show(bool show);
-  void SetFocus();
-  void Enable(bool enable);
-  void Enable(int item, bool enable);
-  void Show(int item, bool show) ;
-  inline void SetLabelFont(const wxFont& WXUNUSED(font)) {};
-  inline void SetButtonFont(const wxFont& font) { SetFont(font); }
-
-  virtual wxString GetStringSelection() const;
-  virtual bool SetStringSelection(const wxString& s);
-  inline virtual int Number() const { return m_noItems; } ;
-  void Command(wxCommandEvent& event);
-  
-  inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
-  inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
+// Specific functions (in wxWindows2 reference)
+       virtual void SetSelection(int item);
+       virtual int GetSelection() const;
+       
+       inline virtual int GetCount() const { return m_noItems; } ;
+
+       virtual wxString GetString(int item) const;
+       virtual void SetString(int item, const wxString& label) ;
+       
+       virtual void Enable(int item, bool enable);
+       virtual void Show(int item, bool show) ;
 
+    virtual int GetColumnCount() const ;
+    virtual int GetRowCount() const ;
+
+
+       virtual bool Enable(bool enable = TRUE);
+       virtual wxString GetLabel() const;
+       virtual void SetLabel(const wxString& label) ;
+       virtual bool Show(bool show = TRUE);
+
+// Other external functions 
+       void Command(wxCommandEvent& event);
+       void SetFocus();
+
+// Other variable access functions
+       inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
+       inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
+
+       void OnRadioButton( wxCommandEvent& event ) ;
 protected:
-/* TODO: implementation
-  WXHWND *          m_radioButtons;
-*/
-  int               m_majorDim ;
-  int               m_noItems;
-  int               m_noRowsOrCols;
-  int               m_selectedButton;
+       wxRadioButton           *m_radioButtonCycle;
+       
+       int               m_majorDim ;
+       int               m_noItems;
+       int               m_noRowsOrCols;
+
+// Internal functions 
+    virtual wxSize DoGetBestSize() const ;
+       virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
 
+    DECLARE_EVENT_TABLE()
 };
 
 #endif