projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Invalidate only the specified rectangle
[wxWidgets.git]
/
src
/
palmos
/
choice.cpp
diff --git
a/src/palmos/choice.cpp
b/src/palmos/choice.cpp
index ce5eedf27463d27b32d75e994511c7625229881c..5ea2d6ea02f790f4a315a0e4289fb49f3cdb07b7 100644
(file)
--- a/
src/palmos/choice.cpp
+++ b/
src/palmos/choice.cpp
@@
-25,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 )
@@
-84,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, wxControl
WithItems
)
#endif
// ============================================================================
#endif
// ============================================================================
@@
-131,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()
{
}
@@
-149,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)
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ void **clientData,
+ wxClientDataType type)
{
return 0;
}
{
return 0;
}
-
int wxChoice::DoInsert(const wxString& item, int pos
)
+
void wxChoice::DoDeleteOneItem(unsigned int n
)
{
{
- return 0;
}
}
-void wxChoice::Delete(int n)
-{
-}
-
-void wxChoice::Clear()
+void wxChoice::DoClear()
{
}
{
}
@@
-188,42
+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;
}
-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::DoSetItemClientData(
unsigned int n, void* clientData
)
{
}
{
}
-void* wxChoice::DoGetItemClientData(
int n
) const
+void* wxChoice::DoGetItemClientData(
unsigned int n
) const
{
{
- return (void *)NULL;
-}
-
-void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
-{
-}
-
-wxClientData* wxChoice::DoGetItemClientObject( int n ) const
-{
- return (wxClientData *)DoGetItemClientData(n);
+ return NULL;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-253,14
+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;
-}
-
#endif // wxUSE_CHOICE
#endif // wxUSE_CHOICE