#if wxUSE_CHOICE && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
+#include "wx/choice.h"
+
#ifndef WX_PRECOMP
- #include "wx/choice.h"
#include "wx/utils.h"
#include "wx/log.h"
#include "wx/brush.h"
wxEND_FLAGS( wxChoiceStyle )
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControl,"wx/choice.h")
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxChoice, wxControlWithItems,"wx/choice.h")
wxBEGIN_PROPERTIES_TABLE(wxChoice)
wxEVENT_PROPERTY( Select , wxEVT_COMMAND_CHOICE_SELECTED , wxCommandEvent )
wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
#else
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
#endif
/*
TODO PROPERTIES
}
// and now we may finally size the control properly (if needed)
- SetBestSize(size);
+ SetInitialSize(size);
return true;
}
wxChoice::~wxChoice()
{
- Free();
+ Clear();
}
// ----------------------------------------------------------------------------
// 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)
{
- int n = (int)SendMessage(GetHwnd(), CB_ADDSTRING, 0, (LPARAM)item.c_str());
- if ( n == CB_ERR )
- {
- wxLogLastError(wxT("SendMessage(CB_ADDSTRING)"));
- }
- else // ok
- {
- // we need to refresh our size in order to have enough space for the
- // newly added items
- if ( !IsFrozen() )
- UpdateVisibleHeight();
- }
+ MSWAllocStorage(items, CB_INITSTORAGE);
- InvalidateBestSize();
- return n;
-}
+ const bool append = pos == GetCount();
-int wxChoice::DoInsert(const wxString& item, unsigned int pos)
-{
- wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
- wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
+ // use CB_ADDSTRING when appending at the end to make sure the control is
+ // resorted if it has wxCB_SORT style
+ const unsigned msg = append ? CB_ADDSTRING : CB_INSERTSTRING;
- int n = (int)SendMessage(GetHwnd(), CB_INSERTSTRING, pos, (LPARAM)item.c_str());
- if ( n == CB_ERR )
- {
- wxLogLastError(wxT("SendMessage(CB_INSERTSTRING)"));
- }
- else // ok
+ if ( append )
+ pos = 0;
+
+ int n = wxNOT_FOUND;
+ const unsigned numItems = items.GetCount();
+ for ( unsigned i = 0; i < numItems; ++i )
{
- if ( !IsFrozen() )
- UpdateVisibleHeight();
+ n = MSWInsertOrAppendItem(pos, items[i], msg);
+ if ( n == wxNOT_FOUND )
+ return n;
+
+ if ( !append )
+ pos++;
+
+ AssignNewItemClientData(n, clientData, i, type);
}
+ // we need to refresh our size in order to have enough space for the
+ // newly added items
+ if ( !IsFrozen() )
+ UpdateVisibleHeight();
+
InvalidateBestSize();
+
return n;
}
-void wxChoice::Delete(unsigned int n)
+void wxChoice::DoDeleteOneItem(unsigned int n)
{
wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::Delete") );
- if ( HasClientObjectData() )
- {
- delete GetClientObject(n);
- }
-
SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
if ( !IsFrozen() )
InvalidateBestSize();
}
-void wxChoice::Clear()
+void wxChoice::DoClear()
{
- Free();
-
SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
if ( !IsFrozen() )
InvalidateBestSize();
}
-void wxChoice::Free()
-{
- if ( HasClientObjectData() )
- {
- unsigned int count = GetCount();
- for ( unsigned int n = 0; n < count; n++ )
- {
- delete GetClientObject(n);
- }
- }
-}
-
// ----------------------------------------------------------------------------
// selection
// ----------------------------------------------------------------------------
else
{
int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
- (WPARAM)-1, (LPARAM)s.c_str());
+ (WPARAM)-1, (LPARAM)s.wx_str());
return pos == LB_ERR ? wxNOT_FOUND : pos;
}
// we have to delete and add back the string as there is no way to change a
// string in place
- // we need to preserve the client data
- void *data;
- if ( m_clientDataItemsType != wxClientData_None )
- {
- data = DoGetItemClientData(n);
- }
- else // no client data
- {
- data = NULL;
- }
+ // we need to preserve the client data manually
+ void *oldData = NULL;
+ wxClientData *oldObjData = NULL;
+ if ( HasClientUntypedData() )
+ oldData = GetClientData(n);
+ else if ( HasClientObjectData() )
+ oldObjData = GetClientObject(n);
::SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
- ::SendMessage(GetHwnd(), CB_INSERTSTRING, n, (LPARAM)s.c_str() );
+ ::SendMessage(GetHwnd(), CB_INSERTSTRING, n, (LPARAM)s.wx_str() );
- if ( data )
- {
- DoSetItemClientData(n, data);
- }
- //else: it's already NULL by default
+ // restore the client data
+ if ( oldData )
+ SetClientData(n, oldData);
+ else if ( oldObjData )
+ SetClientObject(n, oldObjData);
InvalidateBestSize();
}
return (void *)rc;
}
-void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
- DoSetItemClientData(n, clientData);
-}
-
-wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const
-{
- return (wxClientData *)DoGetItemClientData(n);
-}
-
// ----------------------------------------------------------------------------
// wxMSW specific helpers
// ----------------------------------------------------------------------------
int width, int height,
int sizeFlags)
{
+ int heightOrig = height;
+
// the height which we must pass to Windows should be the total height of
// the control including the drop down list while the height given to us
// is, of course, just the height of the permanently visible part of it
wxControl::DoSetSize(x, y, width, height, sizeFlags);
+ // If we're storing a pending size, make sure we store
+ // the original size for reporting back to the app.
+ if (m_pendingSize != wxDefaultSize)
+ m_pendingSize = wxSize(width, heightOrig);
+
// This solution works on XP, but causes choice/combobox lists to be
// too short on W2K and earlier.
#if 0
// need to reset the selection back to it if it's eventually
// cancelled by user
m_lastAcceptedSelection = GetCurrentSelection();
+ if ( m_lastAcceptedSelection == -1 )
+ {
+ // no current selection so no need to restore it later (this
+ // happens when opening a combobox containing text not from its
+ // list of items and we shouldn't erase this text)
+ m_lastAcceptedSelection = wxID_NONE;
+ }
break;
case CBN_CLOSEUP:
projects / wxWidgets.git / blobdiff