From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Jul 2004 12:30:25 +0000 (+0000)
Subject: fixed Freeze/Thaw() for wxCombobox (patch 925808)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e0e3a32dac4d8c000bbe1a365cca29f286144769

fixed Freeze/Thaw() for wxCombobox (patch 925808)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 9abbe7e00f..52cf225acc 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -232,7 +232,8 @@ int wxChoice::DoAppend(const wxString& item)
     {
         // we need to refresh our size in order to have enough space for the
         // newly added items
-        UpdateVisibleHeight();
+        if ( !IsFrozen() )
+            UpdateVisibleHeight();
     }
 
     return n;
@@ -250,7 +251,8 @@ int wxChoice::DoInsert(const wxString& item, int pos)
     }
     else // ok
     {
-        UpdateVisibleHeight();
+        if ( !IsFrozen() )
+            UpdateVisibleHeight();
     }
 
     return n;
@@ -267,7 +269,8 @@ void wxChoice::Delete(int n)
 
     SendMessage(GetHwnd(), CB_DELETESTRING, n, 0);
 
-    UpdateVisibleHeight();
+    if ( !IsFrozen() )
+        UpdateVisibleHeight();
 }
 
 void wxChoice::Clear()
@@ -276,7 +279,8 @@ void wxChoice::Clear()
 
     SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
 
-    UpdateVisibleHeight();
+    if ( !IsFrozen() )
+        UpdateVisibleHeight();
 }
 
 void wxChoice::Free()