A bugfix in the wxTreeCtrl.GetItem wrapper

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 99e7ec087870126d3f351c19234a1ce6221a7980..279e80d7fb79a0beede6ef4e3367ca63611e06b7 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -2,67 +2,82 @@
 // Name:        choice.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
 #ifdef __GNUG__
-#pragma interface
+    #pragma interface "choice.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
 //-----------------------------------------------------------------------------
-// classes
+// wxChoice
 //-----------------------------------------------------------------------------
 
-class wxChoice;
+class wxChoice : public wxChoiceBase
+{
+public:
+    wxChoice();
+    wxChoice( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = (const wxString *) NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr )
+    {
+        m_strings = (wxSortedArrayString *)NULL;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+        Create(parent, id, pos, size, n, choices, style, validator, name);
+    }
+    ~wxChoice();
+    bool Create( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = (wxString *) NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr );
 
-extern const char *wxChoiceNameStr;
+    // implement base class pure virtuals
+    void Delete(int n);
+    void Clear();
 
-//-----------------------------------------------------------------------------
-// wxChoice
-//-----------------------------------------------------------------------------
+    int GetSelection() const;
+    void SetSelection( int n );
 
-class wxChoice: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxChoice)
+    virtual int GetCount() const;
+    int FindString( const wxString& string ) const;
+    wxString GetString( int n ) const;
+    void SetString( int n, const wxString& string );
 
-  public:
+protected:
+    wxList m_clientList;    // contains the client data for the items
 
-    wxChoice(void);
-    wxChoice( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      int n = 0, const wxString choices[] = NULL,
-      long style = 0, const wxString &name = wxChoiceNameStr );
-    bool Create( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
-      int n = 0, const wxString choices[] = NULL,
-      long style = 0, const wxString &name = wxChoiceNameStr );
-    void Append( const wxString &item );
-    void Clear(void);
-    int FindString( const wxString &string ) const;
-    int GetColumns(void) const;
-    int GetSelection(void);
-    wxString GetString( int n ) const;
-    wxString GetStringSelection(void) const;
-    int Number(void) const;
-    void SetColumns( int n = 1 );
-    void SetSelection( int n );
-    void SetStringSelection( const wxString &string );
+    void ApplyWidgetStyle();
+    virtual int DoAppend(const wxString& item);
+
+    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 wxSize DoGetBestSize() const;
+
+private:
+    // common part of Create() and DoAppend()
+    size_t GtkAppendHelper(GtkWidget *menu, 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;
+
+    DECLARE_DYNAMIC_CLASS(wxChoice)
 };
 
+
 #endif // __GTKCHOICEH__