Added missing wx/defs.h includes in propgrid headers

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

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index b009bf35757214e1820d4c260bfcb7af382cff3d..d2332d5d132a011f3f51751712f46534229b3237 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -91,13 +91,15 @@ public:
     // event.GetExtraLong())
     void Command(wxCommandEvent& event);
 
-    // returns the item number at a point or wxNOT_FOUND
+    // return the index of the item at this position or wxNOT_FOUND
     int HitTest(const wxPoint& point) const { return DoListHitTest(point); }
+    int HitTest(int x, int y) const { return DoListHitTest(wxPoint(x, y)); }
 
-    // For generating events in multiple and extended mode
-    wxArrayInt m_oldSelections;
-    void UpdateOldSelections();
-    void CalcAndSendEvent();
+
+    // For generating events in multiple and extended mode: compare the current
+    // selections with the previously recorded ones (in m_oldSelections) and
+    // send the appropriate event if they differ, otherwise just return false.
+    bool CalcAndSendEvent();
 
 protected:
     virtual void DoSetFirstItem(int n) = 0;
@@ -108,8 +110,23 @@ protected:
     virtual int DoListHitTest(const wxPoint& WXUNUSED(point)) const
         { return wxNOT_FOUND; }
 
+    // Send a listbox (de)selection or double click event.
+    //
+    // Returns true if the event was processed.
+    bool SendEvent(wxEventType evtType, int item, bool selected);
+
+    // Array storing the indices of all selected items that we already notified
+    // the user code about for multi selection list boxes.
+    //
+    // TODO-OPT: wxSelectionStore would be more efficient for big list boxes.
+    wxArrayInt m_oldSelections;
+
+    // Update m_oldSelections with currently selected items (does nothing in
+    // single selection mode on platforms other than MSW).
+    void UpdateOldSelections();
+
 private:
-    DECLARE_NO_COPY_CLASS(wxListBoxBase)
+    wxDECLARE_NO_COPY_CLASS(wxListBoxBase);
 };
 
 // ----------------------------------------------------------------------------
@@ -127,7 +144,7 @@ private:
 #elif defined(__WXGTK__)
   #include "wx/gtk1/listbox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/listbox.h"
+    #include "wx/osx/listbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/listbox.h"
 #elif defined(__WXCOCOA__)