X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a236aa2058ccf3d36e9cafc20fa7375080c4be50..f81bd28859d95c2a8f8b6ec71885f8770b5e5e1a:/src/palmos/choice.cpp?ds=inline diff --git a/src/palmos/choice.cpp b/src/palmos/choice.cpp index c6c100fc0a..5ea2d6ea02 100644 --- a/src/palmos/choice.cpp +++ b/src/palmos/choice.cpp @@ -34,8 +34,6 @@ #include "wx/settings.h" #endif -#include "wx/palmos/private.h" - #if wxUSE_EXTENDED_RTTI WX_DEFINE_FLAGS( wxChoiceStyle ) @@ -85,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 // ============================================================================ @@ -132,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() { } @@ -211,7 +199,7 @@ void wxChoice::DoSetItemClientData(unsigned int n, void* clientData) void* wxChoice::DoGetItemClientData(unsigned int n) const { - return (void *)NULL; + return NULL; } // ---------------------------------------------------------------------------- @@ -241,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