compate charset names case-insensitively in GetEncodingFromName()

[wxWidgets.git] / samples / listbox / lboxtest.cpp

diff --git a/samples/listbox/lboxtest.cpp b/samples/listbox/lboxtest.cpp
index 170ac91014b04bd300b5c59aadaa98b67742927f..8f92c1920a46b2b74f9863058c72aadbdd618967 100644 (file)
--- a/samples/listbox/lboxtest.cpp
+++ b/samples/listbox/lboxtest.cpp
@@ -20,11 +20,6 @@
 // declarations
 // ============================================================================
 
-#ifdef __GNUG__
-    #pragma implementation "lboxtest.cpp"
-    #pragma interface "lboxtest.cpp"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -526,6 +521,7 @@ void LboxTestFrame::Reset()
 
 void LboxTestFrame::CreateLbox()
 {
+    wxWindow *parent = m_lbox->GetParent();
     int flags = 0;
     switch ( m_radioSelMode->GetSelection() )
     {
@@ -545,19 +541,16 @@ void LboxTestFrame::CreateLbox()
         flags |= wxLB_SORT;
 
     wxArrayString items;
-    if ( m_lbox )
+    int count = m_lbox->GetCount();
+    for ( int n = 0; n < count; n++ )
     {
-        int count = m_lbox->GetCount();
-        for ( int n = 0; n < count; n++ )
-        {
-            items.Add(m_lbox->GetString(n));
-        }
-
-        m_sizerLbox->Detach(m_lbox);
-        delete m_lbox;
+        items.Add(m_lbox->GetString(n));
     }
 
-    m_lbox = new wxListBox(this, wxID_ANY,
+    m_sizerLbox->Detach(m_lbox);
+    delete m_lbox;
+
+    m_lbox = new wxListBox(parent, LboxTest_Listbox,
                            wxDefaultPosition, wxDefaultSize,
                            0, NULL,
                            flags);