/////////////////////////////////////////////////////////////////////////////
-// Name: choice.h
+// Name: wx/gtk1/choice.h
// Purpose:
// Author: Robert Roebling
-// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GTKCHOICEH__
#define __GTKCHOICEH__
-class WXDLLIMPEXP_BASE wxSortedArrayString;
-class WXDLLIMPEXP_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxSortedArrayString;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
//-----------------------------------------------------------------------------
// wxChoice
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr )
{
- m_strings = (wxSortedArrayString *)NULL;
+ m_strings = NULL;
Create(parent, id, pos, size, n, choices, style, validator, name);
}
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr )
{
- m_strings = (wxSortedArrayString *)NULL;
+ m_strings = NULL;
Create(parent, id, pos, size, choices, style, validator, name);
}
- ~wxChoice();
+ virtual ~wxChoice();
bool Create( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- int n = 0, const wxString choices[] = (wxString *) NULL,
+ int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr );
const wxString& name = wxChoiceNameStr );
// implement base class pure virtuals
- void Delete(int n);
- void Clear();
+ void DoDeleteOneItem(unsigned int n);
+ void DoClear();
int GetSelection() const;
-#if wxABI_VERSION >= 20602
- int GetCurrentSelection() const { return GetSelection(); }
-#endif
- void SetSelection( int n );
+ virtual void SetSelection(int n);
- virtual int GetCount() const;
- int FindString( const wxString& string ) const;
- wxString GetString( int n ) const;
- void SetString( int n, const wxString& string );
+ virtual unsigned int GetCount() const;
+ virtual int FindString(const wxString& s, bool bCase = false) const;
+ virtual wxString GetString(unsigned int n) const;
+ virtual void SetString(unsigned int n, const wxString& string);
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
wxList m_clientList; // contains the client data for the items
void DoApplyWidgetStyle(GtkRcStyle *style);
- virtual int DoAppend(const wxString& item);
- virtual int DoInsert(const wxString& item, int pos);
+ virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ void **clientData, wxClientDataType type);
- 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 void DoSetItemClientData(unsigned int n, void* clientData);
+ virtual void* DoGetItemClientData(unsigned int n) const;
virtual wxSize DoGetBestSize() const;
virtual bool IsOwnGtkWindow( GdkWindow *window );
private:
- // common part of Create() and DoAppend()
- int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);
+ // DoInsertItems() helper
+ int GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item);
// this array is only used for controls with wxCB_SORT style, so only
// allocate it if it's needed (hence using pointer)
wxSortedArrayString *m_strings;
public:
- // this circumvents a GTK+ 2.0 bug so that the selection is
- // invalidated properly
+ // this circumvents a GTK+ 2.0 bug so that the selection is
+ // invalidated properly
int m_selection_hack;
private: