define HDS_FLAT not defined in VC6 headers

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

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 01604e47f6566b43812efacec650362d8cd5148b..50d409c1898069e75d6076c0cf45894c6d2c0ce5 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -30,13 +30,13 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 // global data
 // ----------------------------------------------------------------------------
 
 // global data
 // ----------------------------------------------------------------------------
 

-extern WXDLLEXPORT_DATA(const wxChar) wxListBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxListBoxNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxListBox interface is defined by the class wxListBoxBase
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxListBox interface is defined by the class wxListBoxBase
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxListBoxBase : public wxControlWithItems
+class WXDLLIMPEXP_CORE wxListBoxBase : public wxControlWithItems

 {
 public:
     wxListBoxBase() { }
 {
 public:
     wxListBoxBase() { }


@@ -94,11 +94,10 @@ public:
     // returns the item number at a point or wxNOT_FOUND
     int HitTest(const wxPoint& point) const { return DoListHitTest(point); }
 
     // returns the item number at a point or wxNOT_FOUND
     int HitTest(const wxPoint& point) const { return DoListHitTest(point); }
 

-#if WXWIN_COMPATIBILITY_2_6
-    // compatibility - these functions are deprecated, use the new ones
-    // instead
-    wxDEPRECATED( bool Selected(int n) const );
-#endif // WXWIN_COMPATIBILITY_2_6
+    // For generating events in multiple and extended mode
+    wxArrayInt m_oldSelections;
+    void UpdateOldSelections();
+    void CalcAndSendEvent();

 
 protected:
     virtual void DoSetFirstItem(int n) = 0;
 
 protected:
     virtual void DoSetFirstItem(int n) = 0;


@@ -113,10 +112,6 @@ private:
     DECLARE_NO_COPY_CLASS(wxListBoxBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxListBoxBase)
 };
 

-#if WXWIN_COMPATIBILITY_2_6
-    inline bool wxListBoxBase::Selected(int n) const { return IsSelected(n); }
-#endif // WXWIN_COMPATIBILITY_2_6
-

 // ----------------------------------------------------------------------------
 // include the platform-specific class declaration
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // include the platform-specific class declaration
 // ----------------------------------------------------------------------------


@@ -132,7 +127,7 @@ private:
 #elif defined(__WXGTK__)
   #include "wx/gtk1/listbox.h"
 #elif defined(__WXMAC__)
 #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__)
 #elif defined(__WXPM__)
     #include "wx/os2/listbox.h"
 #elif defined(__WXCOCOA__)