Add some version checks to help compiling on OSX.

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

diff --git a/src/palmos/choice.cpp b/src/palmos/choice.cpp
index ce5eedf27463d27b32d75e994511c7625229881c..e1852a767fc7f8839640b7cc9c0a70c47ac16549 100644 (file)
--- a/src/palmos/choice.cpp
+++ b/src/palmos/choice.cpp
@@ -25,68 +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 )
-
-wxBEGIN_FLAGS( wxChoiceStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-wxEND_FLAGS( wxChoiceStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl,"wx/choice.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxChoice)
-    wxEVENT_PROPERTY( Select , wxEVT_COMMAND_CHOICE_SELECTED , wxCommandEvent )
-
-    wxPROPERTY( Font , wxFont , SetFont , GetFont  , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_COLLECTION( Choices , wxArrayString , wxString , AppendString , GetStrings , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY( Selection ,int, SetSelection, GetSelection, EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
-    wxPROPERTY_FLAGS( WindowStyle , wxChoiceStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxChoice)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-#endif
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -131,16 +78,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()
 {
 }


@@ -149,21 +86,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()

 {
 }
 
 {
 }
 


@@ -188,42 +123,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;
 }
 

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

 {
 }
 
 {
 }
 

-wxString wxChoice::GetString(int n) const
+wxString wxChoice::GetString(unsigned 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;

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


@@ -253,14 +177,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;
-}
-

 #endif // wxUSE_CHOICE
 #endif // wxUSE_CHOICE