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

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 821f16096a1ed2de6512a180a7454c760c75a8c8..ea94e39e032814c5a5cb0d98222cf8c502b8b7aa 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -16,12 +16,10 @@
 #pragma interface "choice.h"
 #endif
 
 #pragma interface "choice.h"
 #endif
 

-#include "wx/ctrlsub.h"
-

 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 
 // Choice item
 WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
 
 // Choice item

-class WXDLLEXPORT wxChoice: public wxControlWithItems
+class WXDLLEXPORT wxChoice: public wxChoiceBase

 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
         
 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
         


@@ -63,7 +61,7 @@ public:
     virtual void SetString(int n, const wxString& s);
     
     // Original API
     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 ;
     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 9cfe04c8d15d5dcfdc5eb5ef1d5e3dedf20f486d..e0afa97dd945b6e51accdcdb5859909aed48ae2d 100644 (file)
--- 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
 {
     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 ++;
         m_clientList.Insert( m_clientList.Item(m_noStrings-1),
                                  (wxObject*) NULL );
     m_noStrings ++;

+
+    return Number() - 1;

 }
 
 void wxChoice::Delete(int WXUNUSED(n))
 }
 
 void wxChoice::Delete(int WXUNUSED(n))


@@ -517,11 +519,13 @@ int wxChoice::GetCount() const
     return Number();
 }
 
     return Number();
 }
 

+/*

 int wxChoice::DoAppend(const wxString& item)
 {
     Append(item);
     return GetCount() - 1;
 }
 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))
 
 // Just appends, doesn't yet insert
 void wxChoice::DoInsertItems(const wxArrayString& items, int WXUNUSED(pos))