reverted last changes by DW

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 0f7d86ec3bca2c99dc17f276a4b23330169fea14..c6a9f7909f1286279a058759f7965290cddc90df 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -85,12 +85,10 @@ bool wxChoice::Create(wxWindow *parent,
     return TRUE;
 }
 
     return TRUE;
 }
 

-/*

 wxChoice::~wxChoice()
 {
     Free();
 }
 wxChoice::~wxChoice()
 {
     Free();
 }

-*/

 
 // ----------------------------------------------------------------------------
 // adding/deleting items to/from the list
 
 // ----------------------------------------------------------------------------
 // adding/deleting items to/from the list


@@ -121,12 +119,11 @@ void wxChoice::Delete(int n)
 
 void wxChoice::Clear()
 {
 
 void wxChoice::Clear()
 {

-//    Free();
+    Free();

 
     SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
 }
 
 
     SendMessage(GetHwnd(), CB_RESETCONTENT, 0, 0);
 }
 

-/*

 void wxChoice::Free()
 {
     if ( HasClientObjectData() )
 void wxChoice::Free()
 {
     if ( HasClientObjectData() )


@@ -138,7 +135,6 @@ void wxChoice::Free()
         }
     }
 }
         }
     }
 }

-*/

 
 // ----------------------------------------------------------------------------
 // selection
 
 // ----------------------------------------------------------------------------
 // selection