cleaning up problems after string changes

[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 75aedb775fee820d5ab28fb4260f8de5078ed0a2..60558e4d08bbdb26bf64612a6bf55cd63220feea 100644 (file)
--- a/include/wx/msw/wince/choicece.h
+++ b/include/wx/msw/wince/choicece.h
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "choicece.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_CHOICE
@@ -83,26 +79,31 @@ public:
 
     // 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 int DoInsert(const wxString& item, unsigned int pos);
+    virtual void Delete(unsigned int n);
     virtual void Clear() ;
 
-    virtual int GetCount() const;
+    virtual unsigned int GetCount() const;
     virtual int GetSelection() const;
     virtual void SetSelection(int n);
 
-    virtual int FindString(const wxString& s) const;
-    virtual wxString GetString(int n) const;
-    virtual void SetString(int n, const wxString& s);
+    virtual int FindString(const wxString& s, bool bCase = false) const;
+    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; }
 
+    // return the choice object whose buddy is the given window or NULL
+    static wxChoice *GetChoiceForListBox(WXHWND hwndBuddy);
+
+    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 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;
 
     // MSW implementation
     virtual void DoGetPosition(int *x, int *y) const;