Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index 54a53b1c58872800c72daa96a4cc8a9a0cee3ffe..0d9982bab80879d9d063718270b621458e84694e 100644 (file)
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -38,7 +38,7 @@ class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxListBox();
+    wxListBox() { Init(); }

     wxListBox(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
     wxListBox(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,


@@ -47,6 +47,8 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr)
     {
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr)
     {

+        Init();
+

         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     wxListBox(wxWindow *parent, wxWindowID id,
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     wxListBox(wxWindow *parent, wxWindowID id,


@@ -57,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);
     }
 


@@ -147,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;
 


@@ -177,6 +183,9 @@ protected:
 #endif
 
 private:
 #endif
 
 private:

+    // common part of all ctors
+    void Init();
+

     // call this when items are added to or deleted from the listbox or an
     // items text changes
     void MSWOnItemsChanged();
     // call this when items are added to or deleted from the listbox or an
     // items text changes
     void MSWOnItemsChanged();


@@ -185,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)
 };