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

Use wxClientDataDictionary for client data.

Browse Source 
Factored out common code into wxSizeKeeper.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-12-24 18:41:42 +00:00
parent c13c9657a4
commit 99ab3e3f56
2 changed files with 100 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/wx/motif/listbox.h
View File

@@ -17,6 +17,7 @@
#endif
#include "wx/ctrlsub.h"
#include "wx/clntdata.h"
WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
@@ -38,8 +39,7 @@ public:
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr):
m_clientDataList(wxKEY_INTEGER)
const wxString& name = wxListBoxNameStr)
{
Create(parent, id, pos, size, n, choices, style, validator, name);
}
@@ -57,10 +57,10 @@ public:
// implementation of wxControlWithItems
virtual int GetCount() const;
virtual int DoAppend(const wxString& item);
virtual void DoSetItemClientData(int n, void* clientData); //
virtual void* DoGetItemClientData(int n) const; //
virtual void DoSetItemClientObject(int n, wxClientData* clientData); //
virtual wxClientData* DoGetItemClientObject(int n) const; //
virtual void DoSetItemClientData(int n, void* clientData);
virtual void* DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject(int n, wxClientData* clientData);
virtual wxClientData* DoGetItemClientObject(int n) const;
virtual int GetSelection() const;
virtual void Delete(int n);
virtual int FindString(const wxString& s) const;
@@ -80,7 +80,6 @@ public:
void Command(wxCommandEvent& event);
// Implementation
virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
WXWidget GetTopWidget() const;
@@ -92,11 +91,9 @@ protected:
int m_noItems;
// List mapping positions->client data
wxList m_clientDataList;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
wxClientDataDictionary m_clientDataDict;
private:
void SetSelectionPolicy();
};
#endif