removing NSWindow based mouse tracking in favour of 10.5+ trackingArea implementation

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

diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h
index bf01a78fecd5de48c6ec094cd02b9f3d277dda27..2165dc9b18b2f56aefca3475926047e1404fbbe8 100644 (file)
--- a/include/wx/osx/listbox.h
+++ b/include/wx/osx/listbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/carbon/listbox.h
+// Name:        wx/osx/listbox.h

 // Purpose:     wxListBox class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxListBox class
 // Author:      Stefan Csomor
 // Modified by:


@@ -90,7 +90,7 @@ public:
         const wxString& name = wxListBoxNameStr);
 
     virtual ~wxListBox();
         const wxString& name = wxListBoxNameStr);
 
     virtual ~wxListBox();

-    
+

     // implement base class pure virtuals
     virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
 
     // implement base class pure virtuals
     virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
 


@@ -102,7 +102,7 @@ public:
     // data callbacks
     virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
     virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
     // data callbacks
     virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
     virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );

-    
+

     virtual bool IsSelected(int n) const;
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
     virtual bool IsSelected(int n) const;
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;


@@ -119,7 +119,7 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     wxListWidgetImpl* GetListPeer() const;
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     wxListWidgetImpl* GetListPeer() const;

-    
+

     bool MacGetBlockEvents() const { return m_blockEvents; }
 
     virtual void HandleLineEvent( unsigned int n, bool doubleClick );
     bool MacGetBlockEvents() const { return m_blockEvents; }
 
     virtual void HandleLineEvent( unsigned int n, bool doubleClick );


@@ -151,11 +151,11 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
     bool m_blockEvents;
     virtual wxSize DoGetBestSize() const;
 
     bool m_blockEvents;

-    
+

     wxListWidgetColumn* m_textColumn;
     wxListWidgetColumn* m_textColumn;

-    
+

     // data storage (copied from univ)
     // data storage (copied from univ)

-    
+

     // the array containing all items (it is sorted if the listbox has
     // wxLB_SORT style)
     union
     // the array containing all items (it is sorted if the listbox has
     // wxLB_SORT style)
     union


@@ -166,8 +166,13 @@ protected:
 
     // and this one the client data (either void or wxClientData)
     wxArrayPtrVoid m_itemsClientData;
 
     // and this one the client data (either void or wxClientData)
     wxArrayPtrVoid m_itemsClientData;

-    
+

 private:
 private:

+#ifdef __WXOSX_CARBON__
+    // It needs to call our CalcAndSendEvent().
+    friend class wxMacDataBrowserListControl;
+#endif // Carbon
+

     DECLARE_DYNAMIC_CLASS(wxListBox)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxListBox)
     DECLARE_EVENT_TABLE()
 };