int wxChoice::DoInsert(const wxString& item, int pos)
{
wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
- wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+ wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
int n = (int)SendMessage(GetHwnd(), CB_INSERTSTRING, pos, (LPARAM)item.c_str());
if ( n == CB_ERR )
void wxChoice::Delete(int n)
{
- wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
+ wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::Delete") );
if ( HasClientObjectData() )
{
// string list functions
// ----------------------------------------------------------------------------
-int wxChoice::GetCount() const
+size_t wxChoice::GetCount() const
{
- return (int)SendMessage(GetHwnd(), CB_GETCOUNT, 0, 0);
+ return (size_t)SendMessage(GetHwnd(), CB_GETCOUNT, 0, 0);
}
int wxChoice::FindString(const wxString& s, bool bCase) const
#if defined(__WATCOMC__) && defined(__WIN386__)
// For some reason, Watcom in WIN386 mode crashes in the CB_FINDSTRINGEXACT message.
// wxChoice::Do it the long way instead.
- int count = GetCount();
- for ( int i = 0; i < count; i++ )
+ size_t count = GetCount();
+ for ( size_t i = 0; i < count; i++ )
{
// as CB_FINDSTRINGEXACT is case insensitive, be case insensitive too
if ( GetString(i).IsSameAs(s, bCase) )
//passed to SendMessage, so we have to do it ourselves in that case
if ( s.empty() )
{
- int count = GetCount();
- for ( int i = 0; i < count; i++ )
+ size_t count = GetCount();
+ for ( size_t i = 0; i < count; i++ )
{
if ( GetString(i).empty() )
return i;
void wxChoice::SetString(int n, const wxString& s)
{
- wxCHECK_RET( n >= 0 && n < GetCount(),
- wxT("invalid item index in wxChoice::SetString") );
+ wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::SetString") );
// we have to delete and add back the string as there is no way to change a
// string in place
{
int heightOrig = height;
+ int widthCurrent, heightCurrent;
+ DoGetSize(&widthCurrent, &heightCurrent);
+
// 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
- if ( height != wxDefaultCoord )
+ if ( height != wxDefaultCoord && height != heightCurrent )
{
// don't make the drop down list too tall, arbitrarily limit it to 40
// items max and also don't leave it empty
const int hItem = SendMessage(GetHwnd(), CB_GETITEMHEIGHT, 0, 0);
height += hItem*(nItems + 1);
}
- else
+ else // keep the same height as now
{
+ // normally wxWindow::DoSetSize() checks if we set the same size as the
+ // window already has and does nothing in this case, but for us the
+ // check fails as the size we pass to it includes the dropdown while
+ // the size returned by our GetSize() does not, so test if the size
+ // didn't really change ourselves here
+ if ( width == wxDefaultCoord || width == widthCurrent )
+ {
+ // size doesn't change, what about position?
+ int xCurrent, yCurrent;
+ DoGetPosition(&xCurrent, &yCurrent);
+ const bool defMeansUnchanged = !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE);
+ if ( ((x == wxDefaultCoord && defMeansUnchanged) || x == xCurrent)
+ &&
+ ((y == wxDefaultCoord && defMeansUnchanged) || y == yCurrent) )
+ {
+ // nothing changes, nothing to do
+ return;
+ }
+ }
+
// We cannot pass wxDefaultCoord as height to wxControl. wxControl uses
// wxGetWindowRect() to determine the current height of the combobox,
// and then again sets the combobox's height to that value. Unfortunately,
// on Win2K), so this would result in a combobox with dropdown height of
// 1 pixel. We have to determine the default height ourselves and call
// wxControl with that value instead.
- int w, h;
+ //
+ // Also notice that sometimes CB_GETDROPPEDCONTROLRECT seems to return
+ // wildly incorrect values (~32000) which looks like a bug in it, just
+ // ignore them in this case
RECT r;
- DoGetSize(&w, &h);
- if (::SendMessage(GetHwnd(), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM) &r) != 0)
+ if ( ::SendMessage(GetHwnd(), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM) &r)
+ && r.bottom < 30000 )
{
- height = h + r.bottom - r.top;
+ height = heightCurrent + r.bottom - r.top;
}
}
bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
{
+ /*
+ The native control provides a great variety in the events it sends in
+ the different selection scenarios (undoubtedly for greater amusement of
+ the programmers using it). For the reference, here are the cases when
+ the final selection is accepted (things are quite interesting when it
+ is cancelled too):
+
+ A. Selecting with just the arrows without opening the dropdown:
+ 1. CBN_SELENDOK
+ 2. CBN_SELCHANGE
+
+ B. Opening dropdown with F4 and selecting with arrows:
+ 1. CBN_DROPDOWN
+ 2. many CBN_SELCHANGE while changing selection in the list
+ 3. CBN_SELENDOK
+ 4. CBN_CLOSEUP
+
+ C. Selecting with the mouse:
+ 1. CBN_DROPDOWN
+ -- no intermediate CBN_SELCHANGEs --
+ 2. CBN_SELENDOK
+ 3. CBN_CLOSEUP
+ 4. CBN_SELCHANGE
+
+ Admire the different order of messages in all of those cases, it must
+ surely have taken a lot of effort to Microsoft developers to achieve
+ such originality.
+ */
switch ( param )
{
case CBN_DROPDOWN:
- // we don't want to track selection using CB_GETCURSEL while the
- // dropdown is opened
+ // we use this value both because we don't want to track selection
+ // using CB_GETCURSEL while the dropdown is opened and because we
+ // need to reset the selection back to it if it's eventually
+ // cancelled by user
m_lastAcceptedSelection = GetCurrentSelection();
break;
case CBN_CLOSEUP:
- // it should be safe to use CB_GETCURSEL again
- m_lastAcceptedSelection = wxID_NONE;
+ // if the selection was accepted by the user, it should have been
+ // reset to wxID_NONE by CBN_SELENDOK, otherwise the selection was
+ // cancelled and we must restore the old one
+ if ( m_lastAcceptedSelection != wxID_NONE )
+ {
+ SetSelection(m_lastAcceptedSelection);
+ m_lastAcceptedSelection = wxID_NONE;
+ }
break;
- case CBN_SELCHANGE:
+ case CBN_SELENDOK:
+ // reset it to prevent CBN_CLOSEUP from undoing the selection (it's
+ // ok to reset it now as GetCurrentSelection() will now return the
+ // same thing anyhow)
+ m_lastAcceptedSelection = wxID_NONE;
+
{
const int n = GetSelection();
ProcessCommand(event);
}
- return true;
+ break;
+
+ // don't handle CBN_SELENDCANCEL: just leave m_lastAcceptedSelection
+ // valid and the selection will be undone in CBN_CLOSEUP above
+
+ // don't handle CBN_SELCHANGE neither, we don't want to generate events
+ // while the dropdown is opened -- but do add it if we ever need this
+
+ default:
+ return false;
}
- return false;
+ return true;
}
WXHBRUSH wxChoice::MSWControlColor(WXHDC hDC, WXHWND hWnd)
projects / wxWidgets.git / blobdiff