fixes I previously forgot to check in

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/choice.h b/include/wx/choice.h
index c87d9345c46e3ceb6a5af8d1d37548af5e21e82e..3b9eaf5558c5cd1f479b676586251c9af2f7dc39 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -43,10 +43,10 @@ public:
     void Append(const wxString& item) { DoAppend(item); }
         // with client data which belongs to the caller
     void Append(const wxString &item, void* clientData)
     void Append(const wxString& item) { DoAppend(item); }
         // with client data which belongs to the caller
     void Append(const wxString &item, void* clientData)

-        { DoAppend(item); SetClientData(GetCount() - 1, clientData); }
+        { int n = DoAppend(item); SetClientData(n, clientData); }

         // with client data which will be deleted by the control
     void Append(const wxString &item, wxClientData* clientData)
         // with client data which will be deleted by the control
     void Append(const wxString &item, wxClientData* clientData)

-        { DoAppend(item); SetClientObject(GetCount() - 1, clientData); }
+        { int n = DoAppend(item); SetClientObject(n, clientData); }

 
     // delete items from the list
         // one item
 
     // delete items from the list
         // one item


@@ -95,7 +95,7 @@ public:
 
 private:
     // pure virtuals to implement in the derived classes
 
 private:
     // pure virtuals to implement in the derived classes

-    virtual void DoAppend(const wxString& item) = 0;
+    virtual int DoAppend(const wxString& item) = 0;

 
     virtual void DoSetClientData( int n, void* clientData ) = 0;
     virtual void* DoGetClientData( int n ) const = 0;
 
     virtual void DoSetClientData( int n, void* clientData ) = 0;
     virtual void* DoGetClientData( int n ) const = 0;

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index ca2bb1666d1c6e1e3ffa2197530e29192ce5fa85..5e5db6054e99fb088e2c9c9a88a5c0b5299a3eb9 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -50,7 +50,7 @@ public:
                 const wxString& name = wxChoiceNameStr);
 
     // implement base class pure virtuals
                 const wxString& name = wxChoiceNameStr);
 
     // implement base class pure virtuals

-    virtual void DoAppend(const wxString& item);
+    virtual int DoAppend(const wxString& item);

     virtual void Delete(int n);
     virtual void Clear();
 
     virtual void Delete(int n);
     virtual void Clear();