From c33c81c30f732efcf82d682f82e94aea81878641 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 24 Aug 2002 10:54:15 +0000
Subject: [PATCH] wxChoice derives from wxChoiceBase; renamed Append to
 DoAppend

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/motif/choice.h | 6 ++----
 src/motif/choice.cpp      | 6 +++++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 821f16096a..ea94e39e03 100644
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -16,12 +16,10 @@
 #pragma interface "choice.h"
 #endif
 
-#include "wx/ctrlsub.h"
-
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 
 // Choice item
-class WXDLLEXPORT wxChoice: public wxControlWithItems
+class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
         
@@ -63,7 +61,7 @@ public:
     virtual void SetString(int n, const wxString& s);
     
     // Original API
-    virtual void Append(const wxString& item);
+    //    virtual void Append(const wxString& item);
     virtual void Delete(int n);
     virtual void Clear();
     virtual int GetSelection() const ;
diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 9cfe04c8d1..e0afa97dd9 100644
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -172,7 +172,7 @@ wxChoice::~wxChoice()
     }
 }
 
-void wxChoice::Append(const wxString& item)
+int wxChoice::DoAppend(const wxString& item)
 {
     Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
 #if USE_GADGETS
@@ -226,6 +226,8 @@ void wxChoice::Append(const wxString& item)
         m_clientList.Insert( m_clientList.Item(m_noStrings-1),
                                  (wxObject*) NULL );
     m_noStrings ++;
+
+    return Number() - 1;
 }
 
 void wxChoice::Delete(int WXUNUSED(n))
@@ -517,11 +519,13 @@ int wxChoice::GetCount() const
     return Number();
 }
 
+/*
 int wxChoice::DoAppend(const wxString& item)
 {
     Append(item);
     return GetCount() - 1;
 }
+*/
 
 // Just appends, doesn't yet insert
 void wxChoice::DoInsertItems(const wxArrayString& items, int WXUNUSED(pos))
-- 
2.45.2