applying patch, fixes #10524

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

diff --git a/src/palmos/choice.cpp b/src/palmos/choice.cpp
index 2abc6a9d89b83f1cfd55ce2342082608d1eee317..5ea2d6ea02f790f4a315a0e4289fb49f3cdb07b7 100644 (file)
--- a/src/palmos/choice.cpp
+++ b/src/palmos/choice.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.cpp
+// Name:        src/palmos/choice.cpp

 // Purpose:     wxChoice
 // Purpose:     wxChoice

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Created:     10/13/04
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "choice.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -29,16 +25,15 @@
 
 #if wxUSE_CHOICE
 
 
 #if wxUSE_CHOICE
 

+#include "wx/choice.h"
+

 #ifndef WX_PRECOMP
 #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/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 )
 
 #if wxUSE_EXTENDED_RTTI
 WX_DEFINE_FLAGS( wxChoiceStyle )
 


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

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

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


@@ -120,7 +115,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
                              const wxValidator& validator,
                              const wxString& name)
 {
                              const wxValidator& validator,
                              const wxString& name)
 {

-    return FALSE;
+    return false;

 }
 
 bool wxChoice::Create(wxWindow *parent,
 }
 
 bool wxChoice::Create(wxWindow *parent,


@@ -135,16 +130,6 @@ bool wxChoice::Create(wxWindow *parent,
     return false;
 }
 
     return false;
 }
 

-bool wxChoice::MSWShouldPreProcessMessage(WXMSG *pMsg)
-{
-    return false;
-}
-
-WXDWORD wxChoice::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    return 0;
-}
-

 wxChoice::~wxChoice()
 {
 }
 wxChoice::~wxChoice()
 {
 }


@@ -153,21 +138,19 @@ wxChoice::~wxChoice()
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
 
 // 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;
 }
 
 {
     return 0;
 }
 

-void wxChoice::Delete(int n)
+void wxChoice::DoDeleteOneItem(unsigned int n)

 {
 }
 
 {
 }
 

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

 {
 }
 
 {
 }
 


@@ -192,47 +175,31 @@ void wxChoice::SetSelection(int n)
 // string list functions
 // ----------------------------------------------------------------------------
 
 // string list functions
 // ----------------------------------------------------------------------------
 

-int wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const

 {
     return 0;
 }
 
 {
     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
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // client data
 // ----------------------------------------------------------------------------
 

-void wxChoice::DoSetItemClientData( int n, void* clientData )
-{
-}
-
-void* wxChoice::DoGetItemClientData( int n ) const
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)

 {
 {

-    return (void *)NULL;

 }
 
 }
 

-void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
+void* wxChoice::DoGetItemClientData(unsigned int n) const

 {
 {

-}
-
-wxClientData* wxChoice::DoGetItemClientObject( int n ) const
-{
-    return (wxClientData *)DoGetItemClientData(n);
+    return NULL;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -262,23 +229,4 @@ wxSize wxChoice::DoGetBestSize() const
     return wxSize(0,0);
 }
 
     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;
-}
-
-WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
-                               WXUINT WXUNUSED(message),
-                               WXWPARAM WXUNUSED(wParam),
-                               WXLPARAM WXUNUSED(lParam)
-     )
-{
-    return (WXHBRUSH) 0;
-}
-

 #endif // wxUSE_CHOICE
 #endif // wxUSE_CHOICE