fixed Freeze/Thaw() for wxCombobox (patch 925808)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -232,7 +232,8 @@ int wxChoice::DoAppend(const wxString& item)
|
|||||||
{
|
{
|
||||||
// we need to refresh our size in order to have enough space for the
|
// we need to refresh our size in order to have enough space for the
|
||||||
// newly added items
|
// newly added items
|
||||||
UpdateVisibleHeight();
|
if ( !IsFrozen() )
|
||||||
|
UpdateVisibleHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
return n;
|
return n;
|
||||||
@@ -250,7 +251,8 @@ int wxChoice::DoInsert(const wxString& item, int pos)
|
|||||||
}
|
}
|
||||||
else // ok
|
else // ok
|
||||||
{
|
{
|
||||||
UpdateVisibleHeight();
|
if ( !IsFrozen() )
|
||||||
|
UpdateVisibleHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
return n;
|
return n;
|
||||||
@@ -267,7 +269,8 @@ void wxChoice::Delete(int n)
|
|||||||
|
|
||||||
SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
|
SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
|
||||||
|
|
||||||
UpdateVisibleHeight();
|
if ( !IsFrozen() )
|
||||||
|
UpdateVisibleHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxChoice::Clear()
|
void wxChoice::Clear()
|
||||||
@@ -276,7 +279,8 @@ void wxChoice::Clear()
|
|||||||
|
|
||||||
SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
|
SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
|
||||||
|
|
||||||
UpdateVisibleHeight();
|
if ( !IsFrozen() )
|
||||||
|
UpdateVisibleHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxChoice::Free()
|
void wxChoice::Free()
|
||||||
|
Reference in New Issue
Block a user