fixed memory leak in wxXmlResource introduced when fixing wxVector<> usage (patch...

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index a61d876403685fdfb648bfff71f912178eaacd6d..4c24c8f52408ea00df61445ce9c15ca2335706c3 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -7,11 +7,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKCHOICEH__
-#define __GTKCHOICEH__
+#ifndef _WX_GTK_CHOICE_H_
+#define _WX_GTK_CHOICE_H_

 
 

-class WXDLLIMPEXP_BASE wxSortedArrayString;
-class WXDLLIMPEXP_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxSortedArrayString;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;

 
 //-----------------------------------------------------------------------------
 // wxChoice
 
 //-----------------------------------------------------------------------------
 // wxChoice


@@ -61,10 +61,6 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
 
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
 

-    // implement base class pure virtuals
-    void Delete(unsigned int n);
-    void Clear();
-

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


@@ -77,22 +73,24 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:

-    wxList m_clientList;    // contains the client data for the items
+    void DoDeleteOneItem(unsigned int n);
+    void DoClear();
+
+    wxArrayPtrVoid m_clientData; // contains the client data for the items

 
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
 
     virtual wxSize DoGetBestSize() const;
     virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 

-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, unsigned int pos);
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);

 
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void* DoGetItemClientData(unsigned int n) const;
 
     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void* DoGetItemClientData(unsigned int n) const;

-    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
-    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;

 
 private:
 
 private:

-    // common part of Create() and DoAppend()
+    // 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
     int GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item);
 
     // this array is only used for controls with wxCB_SORT style, so only


@@ -109,4 +107,4 @@ private:
 };
 
 
 };
 
 

-#endif // __GTKCHOICEH__
+#endif // _WX_GTK_CHOICE_H_