Toolbar/tooltip udates

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

diff --git a/include/wx/mac/choice.h b/include/wx/mac/choice.h
index 231f3511229a198109ca56fa52018cc494fcc31f..f9d790df0641bd512c0ba0e855275ccb67e1c011 100644 (file)
--- a/include/wx/mac/choice.h
+++ b/include/wx/mac/choice.h
@@ -18,16 +18,23 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

+  #include  "wx/dynarray.h"
+

 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 

+WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
+

 // Choice item
 // Choice item

-class WXDLLEXPORT wxChoice: public wxControl
+class WXDLLEXPORT wxChoice: public wxChoiceBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxChoice)
+    DECLARE_DYNAMIC_CLASS(wxChoice)

 
 

- public:
-  wxChoice() {}
-  ~wxChoice() ;
+public:
+    wxChoice()
+        : m_strings(), m_datas(), m_macPopUpMenuHandle(NULL)
+        {}
+    
+    virtual ~wxChoice() ;

 
   wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
 
   wxChoice(wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,


@@ -48,32 +55,50 @@ class WXDLLEXPORT wxChoice: public wxControl
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxChoiceNameStr);
 

-  virtual void Append(const wxString& item);
-  // Added min Append and GetClientData
-  virtual void Append(const wxString& item, void *client_data);
-  virtual void *GetClientData(int index) const;
+  // implement base class pure virtuals
+  virtual int DoAppend(const wxString& item);

   virtual void Delete(int n);
   virtual void Clear();
   virtual void Delete(int n);
   virtual void Clear();

+
+  virtual int GetCount() const ;

   virtual int GetSelection() const ;
   virtual void SetSelection(int n);
   virtual int GetSelection() const ;
   virtual void SetSelection(int n);

-  virtual inline void Select( int n ) { SetSelection( n ); }
+

   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;
   virtual int FindString(const wxString& s) const;
   virtual wxString GetString(int n) const ;

+  virtual void SetString( int , const wxString& s ) ;
+       void            MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;
+
+/*
+  virtual void Append(const wxString& item);
+  // Added min Append and GetClientData
+  virtual void Append(const wxString& item, void *client_data);
+  virtual void *GetClientData(int index) const;
+  virtual inline void Select( int n ) { SetSelection( n ); }

   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   virtual wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);
 
   virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
   virtual wxString GetStringSelection() const ;
   virtual bool SetStringSelection(const wxString& sel);
 

-  virtual inline int Number() const { return m_strings.GetCount(); }
-  virtual inline int GetCount() const { return m_strings.GetCount(); }
+  // Mac specific

   virtual void Command(wxCommandEvent& event);
   virtual void Command(wxCommandEvent& event);

+  void         MacHandleControlClick( WXWidget control , wxInt16 controlpart ) ;

 
 

-  virtual inline void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ } ;

   virtual inline int GetColumns() const { return 1 ; };
   virtual inline int GetColumns() const { return 1 ; };

-       void            MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
-
+*/

 protected:
 protected:

+    virtual wxSize DoGetBestSize() const ;
+    virtual void DoSetItemClientData( int n, void* clientData );
+    virtual void* DoGetItemClientData( int n ) const;
+    virtual void DoSetItemClientObject( int n, wxClientData* clientData );
+    virtual wxClientData* DoGetItemClientObject( int n ) const;
+
+    // free all memory we have (used by Clear() and dtor)
+    // prevent collision with some BSD definitions of macro Free()   
+    void FreeData();
+

   wxArrayString m_strings;
   wxArrayString m_strings;

-  MenuHandle   m_macPopUpMenuHandle ;
+  wxChoiceDataArray m_datas ;
+  WXHMENU      m_macPopUpMenuHandle ;

 };
 
 #endif
 };
 
 #endif