remove SetBackgroundStyle call from OnInternalIdle, it should be done from realize...

[wxWidgets.git] / include / wx / msw / listbox.h

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 38b1afcd158a889d3437634dfb07b84ba89e4cdd..0d9982bab80879d9d063718270b621458e84694e 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -59,6 +59,8 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr)
     {
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr)
     {

+        Init();
+

         Create(parent, id, pos, size, choices, style, validator, name);
     }
 
         Create(parent, id, pos, size, choices, style, validator, name);
     }
 


@@ -149,6 +151,8 @@ public:
 
     virtual void OnInternalIdle();
 
 
     virtual void OnInternalIdle();
 

+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+

 protected:
     virtual wxSize DoGetBestClientSize() const;
 
 protected:
     virtual wxSize DoGetBestClientSize() const;
 


@@ -190,6 +194,11 @@ private:
     // i.e. if we need to call SetHorizontalExtent() from OnInternalIdle()
     bool m_updateHorizontalExtent;
 
     // i.e. if we need to call SetHorizontalExtent() from OnInternalIdle()
     bool m_updateHorizontalExtent;
 

+    // flag set to true when we get a keyboard event and reset to false when we
+    // get a mouse one: this is used to find the correct item for the selection
+    // event
+    bool m_selectedByKeyboard;
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxListBox)
 };