Don't use wxDC in header

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

diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h
index d8572170ab87ef45da4c1dd440d53dec1a534360..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
-    wxListBox();
+    wxListBox() { Init(); }
     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)
     {
+        Init();
+
         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)
     {
+        Init();
+
         Create(parent, id, pos, size, choices, style, validator, name);
     }
 
@@ -93,7 +97,6 @@ public:
     // ownerdrawn wxListBox and wxCheckListBox support
 #if wxUSE_OWNER_DRAWN
     // override base class virtuals
-    virtual void Delete(unsigned int n);
     virtual bool SetFont(const wxFont &font);
 
     bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
@@ -146,6 +149,10 @@ public:
     // returns true if the platform should explicitly apply a theme border
     virtual bool CanApplyThemeBorder() const { return false; }
 
+    virtual void OnInternalIdle();
+
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
 protected:
     virtual wxSize DoGetBestClientSize() const;
 
@@ -165,8 +172,8 @@ protected:
     // this can't be called DoHitTest() because wxWindow already has this method
     virtual int DoHitTestList(const wxPoint& point) const;
 
-    bool m_updateHorizontalExtent;
-    virtual void OnInternalIdle();
+    // free memory (common part of Clear() and dtor)
+    void Free();
 
     unsigned int m_noItems;
 
@@ -176,6 +183,22 @@ protected:
 #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();
+
+    // flag indicating whether the max horizontal extent should be updated,
+    // 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)
 };