Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes I previously forgot to check in

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-03 00:05:52 +00:00
parent 5fd11f0971
commit 4cd056a7c1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/choice.h
View File

@@ -43,10 +43,10 @@ public:
void Append(const wxString& item) { DoAppend(item); } void Append(const wxString& item) { DoAppend(item); }
// with client data which belongs to the caller // with client data which belongs to the caller
void Append(const wxString &item, void* clientData) 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 // with client data which will be deleted by the control
void Append(const wxString &item, wxClientData* clientData) 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 // delete items from the list
// one item // one item
@@ -95,7 +95,7 @@ public:
private: private:
// pure virtuals to implement in the derived classes // 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 DoSetClientData( int n, void* clientData ) = 0;
virtual void* DoGetClientData( int n ) const = 0; virtual void* DoGetClientData( int n ) const = 0;

2
include/wx/msw/choice.h
View File

@@ -50,7 +50,7 @@ public:
const wxString& name = wxChoiceNameStr); const wxString& name = wxChoiceNameStr);
// implement base class pure virtuals // implement base class pure virtuals
virtual void DoAppend(const wxString& item); virtual int DoAppend(const wxString& item);
virtual void Delete(int n); virtual void Delete(int n);
virtual void Clear(); virtual void Clear();