1) Added call to wxLog::Flush() to wxApp::OnIdle()

[wxWidgets.git] / src / msw / listbox.cpp

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 3971e400ee46b56530f14e3e65a5146bdc2aea27..8c8922b504cff81624ea6e2a5ca6fe99a517848a 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -646,10 +646,11 @@ void wxListBox::SetString(const int N, const wxString& s)
   if (sel >= 0)
     SetSelection(sel);
 
   if (sel >= 0)
     SetSelection(sel);
 

-  #if       USE_OWNER_DRAWN
-    // update item's text
-    m_aItems[N]->SetName(s);
-  #endif  //USE_OWNER_DRAWN
+#if       USE_OWNER_DRAWN
+  if ( m_windowStyle & wxLB_OWNERDRAW )
+         // update item's text
+         m_aItems[N]->SetName(s);
+#endif  //USE_OWNER_DRAWN

 }
 
 int wxListBox::Number (void) const
 }
 
 int wxListBox::Number (void) const