don't use built-in support for menu bitmaps if they are too big, they don't come...

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

diff --git a/src/palmos/listbox.cpp b/src/palmos/listbox.cpp
index 7302ebdaf0a15290b887d45edc584f30c4306950..fd23382ec914dab549a1fb7f0ee1fc5663ae02e9 100644 (file)
--- a/src/palmos/listbox.cpp
+++ b/src/palmos/listbox.cpp
@@ -18,21 +18,21 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

-#ifndef WX_PRECOMP

 #include "wx/listbox.h"
 #include "wx/listbox.h"

-#include "wx/settings.h"
-#include "wx/brush.h"
-#include "wx/font.h"
-#include "wx/dc.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/settings.h"
+    #include "wx/brush.h"
+    #include "wx/font.h"
+    #include "wx/dc.h"
+    #include "wx/utils.h"
+    #include "wx/log.h"
+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/palmos/private.h"
 
 #include "wx/palmos/private.h"
 

-#include "wx/dynarray.h"
-#include "wx/log.h"
-

 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif
 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif


@@ -95,7 +95,7 @@ wxEND_HANDLERS_TABLE()
 
 wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
 #else
 
 wxCONSTRUCTOR_4( wxListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
 #else

-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -177,20 +177,11 @@ void wxListBox::DoSetFirstItem(int N)
 {
 }
 
 {
 }
 

-void wxListBox::Delete(int N)
-{
-}
-
-int wxListBox::DoAppend(const wxString& item)
-{
-    return 0;
-}
-
-void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
+void wxListBox::DoDeleteOneItem(unsigned int n)

 {
 }
 
 {
 }
 

-void wxListBox::Clear()
+void wxListBox::DoClear()

 {
 }
 
 {
 }
 


@@ -207,21 +198,12 @@ bool wxListBox::IsSelected(int N) const
     return false;
 }
 
     return false;
 }
 

-wxClientData* wxListBox::DoGetItemClientObject(int n) const
-{
-    return (wxClientData *)DoGetItemClientData(n);
-}
-
-void *wxListBox::DoGetItemClientData(int n) const
-{
-    return (void *)NULL;
-}
-
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void *wxListBox::DoGetItemClientData(unsigned int n) const

 {
 {

+    return NULL;

 }
 
 }
 

-void wxListBox::DoSetItemClientData(int n, void *clientData)
+void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)

 {
 }
 
 {
 }
 


@@ -238,23 +220,23 @@ int wxListBox::GetSelection() const
 }
 
 // Find string for position
 }
 
 // Find string for position

-wxString wxListBox::GetString(int N) const
+wxString wxListBox::GetString(unsigned int n) const

 {
 {

-    wxString result;
-
-    return result;
+    return wxEmptyString;

 }
 
 }
 

-void
-wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                             unsigned int pos,
+                             void **clientData,
+                             wxClientDataType type)

 {
 {

+    return 0;

 }
 }

-
-void wxListBox::SetString(int N, const wxString& s)
+void wxListBox::SetString(unsigned int n, const wxString& s)

 {
 }
 
 {
 }
 

-size_t wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const

 {
     return 0;
 }
 {
     return 0;
 }