added wxWindow::IsFrozen() (only existed in wxMSW and wxDFB before)

[wxWidgets.git] / src / generic / vlbox.cpp

diff --git a/src/generic/vlbox.cpp b/src/generic/vlbox.cpp
index d53213a28491dc94e142b608157e1ecd16973e21..7cdf248b6a21ef596425b6fdfb9d31156b87271d 100644 (file)
--- a/src/generic/vlbox.cpp
+++ b/src/generic/vlbox.cpp
@@ -26,12 +26,14 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#include "wx/vlbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/dcclient.h"

+    #include "wx/listbox.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/vlbox.h"

 #include "wx/dcbuffer.h"
 #include "wx/selstore.h"
 
 #include "wx/dcbuffer.h"
 #include "wx/selstore.h"
 


@@ -92,7 +94,7 @@ bool wxVListBox::Create(wxWindow *parent,
 
 wxVListBox::~wxVListBox()
 {
 
 wxVListBox::~wxVListBox()
 {

-    delete m_doubleBuffer;    
+    delete m_doubleBuffer;

     delete m_selStore;
 }
 
     delete m_selStore;
 }
 


@@ -262,7 +264,10 @@ void wxVListBox::SetSelection(int selection)
 
     if ( HasMultipleSelection() )
     {
 
     if ( HasMultipleSelection() )
     {

-        Select(selection);
+        if (selection != wxNOT_FOUND)
+            Select(selection);
+        else
+            DeselectAll();

         m_anchor = selection;
     }
 
         m_anchor = selection;
     }
 


@@ -645,8 +650,6 @@ void wxVListBox::OnLeftDClick(wxMouseEvent& eventMouse)
 // use the same default attributes as wxListBox
 // ----------------------------------------------------------------------------
 
 // use the same default attributes as wxListBox
 // ----------------------------------------------------------------------------
 

-#include "wx/listbox.h"
-

 //static
 wxVisualAttributes
 wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant)
 //static
 wxVisualAttributes
 wxVListBox::GetClassDefaultAttributes(wxWindowVariant variant)