update version check for glib 2.32

[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 60558e4d08bbdb26bf64612a6bf55cd63220feea..5e2d0da6805387e5c0b054ad866a05c223ed57d7 100644 (file)
--- a/include/wx/msw/wince/choicece.h
+++ b/include/wx/msw/wince/choicece.h
@@ -6,7 +6,7 @@
 // Created:     29.07.2004
 // RCS-ID:      $Id$
 // Copyright:   (c) Wlodzimierz Skiba
 // Created:     29.07.2004
 // RCS-ID:      $Id$
 // Copyright:   (c) Wlodzimierz Skiba

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICECE_H_BASE_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICECE_H_BASE_


@@ -22,14 +22,14 @@
 
 #include "wx/dynarray.h"
 
 
 #include "wx/dynarray.h"
 

-class WXDLLEXPORT wxChoice;
+class WXDLLIMPEXP_FWD_CORE wxChoice;

 WX_DEFINE_EXPORTED_ARRAY_PTR(wxChoice *, wxArrayChoiceSpins);
 
 // ----------------------------------------------------------------------------
 // Choice item
 // ----------------------------------------------------------------------------
 
 WX_DEFINE_EXPORTED_ARRAY_PTR(wxChoice *, wxArrayChoiceSpins);
 
 // ----------------------------------------------------------------------------
 // Choice item
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxChoice : public wxChoiceBase
+class WXDLLIMPEXP_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;