/////////////////////////////////////////////////////////////////////////////
// Name: choice.h
// Purpose: wxChoice class
-// Author: AUTHOR
+// Author: Stefan Csomor
// Modified by:
-// Created: ??/??/98
+// Created: 1998-01-01
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) Stefan Csomor
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHOICE_H_
#define _WX_CHOICE_H_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "choice.h"
#endif
#include "wx/control.h"
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
+ #include "wx/dynarray.h"
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
+
+WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
// Choice item
-class WXDLLEXPORT wxChoice: public wxControl
+class WXDLLEXPORT wxChoice: public wxChoiceBase
{
- DECLARE_DYNAMIC_CLASS(wxChoice)
+ DECLARE_DYNAMIC_CLASS(wxChoice)
- public:
- inline wxChoice() {}
+public:
+ wxChoice()
+ : m_strings(), m_datas(), m_macPopUpMenuHandle(NULL)
+ {}
+
+ virtual ~wxChoice() ;
- inline wxChoice(wxWindow *parent, wxWindowID id,
+ wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr);
- virtual void Append(const wxString& item);
+ // implement base class pure virtuals
+ virtual int DoAppend(const wxString& item);
+ virtual int DoInsert(const wxString& item, int pos);
virtual void Delete(int n);
virtual void Clear();
+
+ virtual int GetCount() const ;
virtual int GetSelection() const ;
virtual void SetSelection(int n);
+
virtual int FindString(const wxString& s) const;
virtual wxString GetString(int n) const ;
- 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 SetString( int , const wxString& s ) ;
+ void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
- virtual inline int Number() const { return m_strings.GetCount(); }
- virtual void Command(wxCommandEvent& event);
+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;
- virtual inline void SetColumns(int WXUNUSED(n) = 1 ) { /* No effect */ } ;
- virtual inline int GetColumns() const { return 1 ; };
- void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+ // free all memory we have (used by Clear() and dtor)
+ // prevent collision with some BSD definitions of macro Free()
+ void FreeData();
-protected:
wxArrayString m_strings;
- MenuHandle m_macPopUpMenuHandle ;
+ wxChoiceDataArray m_datas ;
+ WXHMENU m_macPopUpMenuHandle ;
};
#endif
- // _WX_CHOICE_H_
+ // _WX_CHOICE_H_