projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement wxMask copy ctor for wxGTK.
[wxWidgets.git]
/
include
/
wx
/
msw
/
wince
/
choicece.h
diff --git
a/include/wx/msw/wince/choicece.h
b/include/wx/msw/wince/choicece.h
index 3b827e73a415054b5bfdde36bf07840482640874..0a55eb2b2c756fcccab13e95b05eb84f5544b1ae 100644
(file)
--- a/
include/wx/msw/wince/choicece.h
+++ b/
include/wx/msw/wince/choicece.h
@@
-29,7
+29,7
@@
WX_DEFINE_EXPORTED_ARRAY_PTR(wxChoice *, wxArrayChoiceSpins);
// Choice item
// ----------------------------------------------------------------------------
// Choice item
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxChoice : public wxChoiceBase
+class WXDLL
IMPEXP_CORE
wxChoice : public wxChoiceBase
{
public:
// ctors
{
public:
// ctors
@@
-78,10
+78,8
@@
public:
const wxString& name = wxChoiceNameStr);
// implement base class pure virtuals
const wxString& name = wxChoiceNameStr);
// implement base class pure virtuals
- virtual int DoAppend(const wxString& item);
- virtual int DoInsert(const wxString& item, unsigned int pos);
- virtual void Delete(unsigned int n);
- virtual void Clear() ;
+ virtual void DoDeleteOneItem(unsigned int n);
+ virtual void DoClear();
virtual unsigned int GetCount() const;
virtual int GetSelection() const;
virtual unsigned int GetCount() const;
virtual int GetSelection() const;
@@
-100,10
+98,14
@@
public:
virtual bool MSWCommand(WXUINT param, WXWORD id);
protected:
virtual bool MSWCommand(WXUINT param, WXWORD id);
protected:
+ virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ void **clientData, wxClientDataType type);
+
virtual void DoSetItemClientData(unsigned int n, void* clientData);
virtual void* DoGetItemClientData(unsigned int n) const;
virtual void DoSetItemClientData(unsigned int n, void* clientData);
virtual void* DoGetItemClientData(unsigned int n) const;
- virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
- virtual
wxClientData* DoGetItemClientObject(unsigned int n) const;
+
+ virtual
WXHWND MSWGetItemsHWND() const { return m_hwndBuddy; }
// MSW implementation
virtual void DoGetPosition(int *x, int *y) const;
// MSW implementation
virtual void DoGetPosition(int *x, int *y) const;
@@
-122,9
+124,6
@@
protected:
const wxValidator& validator,
const wxString& name);
const wxValidator& validator,
const wxString& name);
- // free all memory we have (used by Clear() and dtor)
- void Free();
-
// the data for the "buddy" list
WXHWND m_hwndBuddy;
WXFARPROC m_wndProcBuddy;
// the data for the "buddy" list
WXHWND m_hwndBuddy;
WXFARPROC m_wndProcBuddy;