no real change: just rename "near" into "onNearPart" (MSVC doesn't like 'near' as...

[wxWidgets.git] / src / palmos / choice.cpp

diff --git a/src/palmos/choice.cpp b/src/palmos/choice.cpp
index 7f1a5a0bacf094710a0a92627af627c23e032685..5ea2d6ea02f790f4a315a0e4289fb49f3cdb07b7 100644 (file)
--- a/src/palmos/choice.cpp
+++ b/src/palmos/choice.cpp
@@ -25,16 +25,15 @@
 
 #if wxUSE_CHOICE
 
+#include "wx/choice.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/choice.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/brush.h"
     #include "wx/settings.h"
 #endif
 
-#include "wx/palmos/private.h"
-
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxChoiceStyle )
 
@@ -84,7 +83,7 @@ wxEND_HANDLERS_TABLE()
 
 wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
 #else
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
 #endif
 
 // ============================================================================
@@ -131,16 +130,6 @@ bool wxChoice::Create(wxWindow *parent,
     return false;
 }
 
-bool wxChoice::MSWShouldPreProcessMessage(WXMSG *pMsg)
-{
-    return false;
-}
-
-WXDWORD wxChoice::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    return 0;
-}
-
 wxChoice::~wxChoice()
 {
 }
@@ -149,21 +138,19 @@ wxChoice::~wxChoice()
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
 
-int wxChoice::DoAppend(const wxString& item)
-{
-    return 0;
-}
-
-int wxChoice::DoInsert(const wxString& item, int pos)
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items,
+                            unsigned int pos,
+                            void **clientData,
+                            wxClientDataType type)
 {
     return 0;
 }
 
-void wxChoice::Delete(int n)
+void wxChoice::DoDeleteOneItem(unsigned int n)
 {
 }
 
-void wxChoice::Clear()
+void wxChoice::DoClear()
 {
 }
 
@@ -188,47 +175,31 @@ void wxChoice::SetSelection(int n)
 // string list functions
 // ----------------------------------------------------------------------------
 
-int wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const
 {
     return 0;
 }
 
-int wxChoice::FindString(const wxString& s) const
+void wxChoice::SetString(unsigned int n, const wxString& s)
 {
-    return 0;
 }
 
-void wxChoice::SetString(int n, const wxString& s)
+wxString wxChoice::GetString(unsigned int n) const
 {
-}
-
-wxString wxChoice::GetString(int n) const
-{
-    wxString str;
-
-    return str;
+    return wxEmptyString;
 }
 
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------
 
-void wxChoice::DoSetItemClientData( int n, void* clientData )
-{
-}
-
-void* wxChoice::DoGetItemClientData( int n ) const
-{
-    return (void *)NULL;
-}
-
-void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
 {
 }
 
-wxClientData* wxChoice::DoGetItemClientObject( int n ) const
+void* wxChoice::DoGetItemClientData(unsigned int n) const
 {
-    return (wxClientData *)DoGetItemClientData(n);
+    return NULL;
 }
 
 // ----------------------------------------------------------------------------
@@ -258,14 +229,4 @@ wxSize wxChoice::DoGetBestSize() const
     return wxSize(0,0);
 }
 
-WXLRESULT wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    return 0;
-}
-
-bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
-{
-    return false;
-}
-
 #endif // wxUSE_CHOICE