added WX_ASSERT_MESSAGE macro to simply using CPPUNIT_ASSERT_MESSAGE with wxString...

[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 027837225a3984a6a46b52fda893939b388c4587..5f4e3302d5ec9ab4fc0d2e50e229b844af1d7b80 100644 (file)
--- a/include/wx/msw/wince/choicece.h
+++ b/include/wx/msw/wince/choicece.h
@@ -22,7 +22,7 @@
 
 #include "wx/dynarray.h"
 
 
 #include "wx/dynarray.h"
 

-class WXDLLEXPORT wxChoice;
+class WXDLLIMPEXP_FWD_CORE wxChoice;

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


@@ -78,18 +78,16 @@ 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, int pos);
-    virtual void Delete(int n);
-    virtual void Clear() ;
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();

 
 

-    virtual size_t GetCount() const;
+    virtual unsigned int GetCount() const;

     virtual int GetSelection() const;
     virtual void SetSelection(int n);
 
     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual int GetSelection() const;
     virtual void SetSelection(int n);
 
     virtual int FindString(const wxString& s, bool bCase = false) const;

-    virtual wxString GetString(int n) const;
-    virtual void SetString(int n, const wxString& s);
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& s);

 
     // get the subclassed window proc of the buddy list of choices
     WXFARPROC GetBuddyWndProc() const { return m_wndProcBuddy; }
 
     // get the subclassed window proc of the buddy list of choices
     WXFARPROC GetBuddyWndProc() const { return m_wndProcBuddy; }


@@ -100,10 +98,14 @@ public:
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
 protected:
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
 protected:

-    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 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 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;