destroy m_impl even if an exception is thrown from the main loop

[wxWidgets.git] / include / wx / mac / carbon / listctrl.h

diff --git a/include/wx/mac/carbon/listctrl.h b/include/wx/mac/carbon/listctrl.h
index 9dbab2222362a84a8f29d3e75fb8f013f1db982e..03376614adb2a986b6a1d3c712f8b21fc36b316c 100644 (file)
--- a/include/wx/mac/carbon/listctrl.h
+++ b/include/wx/mac/carbon/listctrl.h
@@ -12,8 +12,11 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 

+#include "wx/defs.h"

 #include "wx/generic/listctrl.h"
 
 #include "wx/generic/listctrl.h"
 

+#define wxMAC_ALWAYS_USE_GENERIC_LISTCTRL wxT("mac.listctrl.always_use_generic")
+

 class wxMacDataBrowserListCtrlControl;
 class wxMacListControl;
 class wxListCtrlTextCtrlWrapper;
 class wxMacDataBrowserListCtrlControl;
 class wxMacListControl;
 class wxListCtrlTextCtrlWrapper;


@@ -105,10 +108,10 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   // Sets the item text
   void SetItemText(long item, const wxString& str) ;
 
   // Sets the item text
   void SetItemText(long item, const wxString& str) ;

-  
+

   void SetItemTextColour(long item, const wxColour& colour) ;
   wxColour GetItemTextColour(long item) const;
   void SetItemTextColour(long item, const wxColour& colour) ;
   wxColour GetItemTextColour(long item) const;

-  
+

   void SetItemBackgroundColour(long item, const wxColour& colour) ;
   wxColour GetItemBackgroundColour(long item) const;
 
   void SetItemBackgroundColour(long item, const wxColour& colour) ;
   wxColour GetItemBackgroundColour(long item) const;
 


@@ -141,7 +144,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   // Gets the number of selected items in the list control
   int GetSelectedItemCount() const;
 
   // Gets the number of selected items in the list control
   int GetSelectedItemCount() const;

-  
+

   wxRect GetViewRect() const;
 
   // Gets the text colour of the listview
   wxRect GetViewRect() const;
 
   // Gets the text colour of the listview


@@ -313,13 +316,13 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   wxListCtrlCompare GetCompareFunc() { return m_compareFunc; };
   long GetCompareFuncData() { return m_compareFuncData; };
 
   wxListCtrlCompare GetCompareFunc() { return m_compareFunc; };
   long GetCompareFuncData() { return m_compareFuncData; };
 

-  
-  // public overrides needed for pimpl approach  
+
+  // public overrides needed for pimpl approach

   virtual bool SetFont(const wxFont& font);
   virtual bool SetForegroundColour(const wxColour& colour);
   virtual bool SetBackgroundColour(const wxColour& colour);
   virtual wxColour GetBackgroundColour();
   virtual bool SetFont(const wxFont& font);
   virtual bool SetForegroundColour(const wxColour& colour);
   virtual bool SetBackgroundColour(const wxColour& colour);
   virtual wxColour GetBackgroundColour();

-  
+

   // functions for editing/timer
   void OnRenameTimer();
   bool OnRenameAccept(long itemEdit, const wxString& value);
   // functions for editing/timer
   void OnRenameTimer();
   bool OnRenameAccept(long itemEdit, const wxString& value);


@@ -328,25 +331,37 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   void ChangeCurrent(long current);
   void ResetCurrent() { ChangeCurrent((long)-1); }
   bool HasCurrent() const { return m_current != (long)-1; }
   void ChangeCurrent(long current);
   void ResetCurrent() { ChangeCurrent((long)-1); }
   bool HasCurrent() const { return m_current != (long)-1; }

-  
+

   void OnLeftDown(wxMouseEvent& event);
   void OnDblClick(wxMouseEvent& event);
   void OnLeftDown(wxMouseEvent& event);
   void OnDblClick(wxMouseEvent& event);

-  
+

   void FinishEditing(wxTextCtrl *text)
   {
       delete text;
       m_textctrlWrapper = NULL;
       SetFocus();
   }
   void FinishEditing(wxTextCtrl *text)
   {
       delete text;
       m_textctrlWrapper = NULL;
       SetFocus();
   }

-  
+
+  virtual int GetScrollPos(int orient) const;
+
+  void OnRightDown(wxMouseEvent& event);
+  void OnMiddleDown(wxMouseEvent& event);
+  void OnChar(wxKeyEvent& event);
+  virtual void SetFocus();
+  void FireMouseEvent(wxEventType eventType, wxPoint position);
+
+  virtual void SetDropTarget( wxDropTarget *dropTarget );
+  virtual wxDropTarget* GetDropTarget() const;
+

   // with CG, we need to get the context from an kEventControlDraw event
   // unfortunately, the DataBrowser callbacks don't provide the context
   // with CG, we need to get the context from an kEventControlDraw event
   // unfortunately, the DataBrowser callbacks don't provide the context

-  // and we need it, so we need to set/remove it before and after draw 
+  // and we need it, so we need to set/remove it before and after draw

   // events so we can access it in the callbacks.
   void MacSetDrawingContext(void* context) { m_cgContext = context; }
   void* MacGetDrawingContext() { return m_cgContext; }
 
 protected:
   // events so we can access it in the callbacks.
   void MacSetDrawingContext(void* context) { m_cgContext = context; }
   void* MacGetDrawingContext() { return m_cgContext; }
 
 protected:

+

   // protected overrides needed for pimpl approach
   virtual void DoSetSize(int x, int y,
                          int width, int height,
   // protected overrides needed for pimpl approach
   virtual void DoSetSize(int x, int y,
                          int width, int height,


@@ -359,23 +374,23 @@ protected:
   wxListCtrlRenameTimer *m_renameTimer;
   // common part of all ctors
   void Init();
   wxListCtrlRenameTimer *m_renameTimer;
   // common part of all ctors
   void Init();

-  
+

   wxGenericListCtrl* m_genericImpl;   // allow use of the generic impl.
   wxMacDataBrowserListCtrlControl* m_dbImpl;
   void*  m_macListCtrlEventHandler;
   void*  m_cgContext;
   wxListCtrlCompare m_compareFunc;
   long m_compareFuncData;
   wxGenericListCtrl* m_genericImpl;   // allow use of the generic impl.
   wxMacDataBrowserListCtrlControl* m_dbImpl;
   void*  m_macListCtrlEventHandler;
   void*  m_cgContext;
   wxListCtrlCompare m_compareFunc;
   long m_compareFuncData;

-  
+

   wxTextCtrl*       m_textCtrl;        // The control used for editing a label
   wxImageList *     m_imageListNormal; // The image list for normal icons
   wxImageList *     m_imageListSmall;  // The image list for small icons
   wxImageList *     m_imageListState;  // The image list state icons (not implemented yet)
   wxTextCtrl*       m_textCtrl;        // The control used for editing a label
   wxImageList *     m_imageListNormal; // The image list for normal icons
   wxImageList *     m_imageListSmall;  // The image list for small icons
   wxImageList *     m_imageListState;  // The image list state icons (not implemented yet)

-  
+

   wxColumnList      m_colsInfo; // for storing info about each column
   wxColour          m_textColor;
   wxColumnList      m_colsInfo; // for storing info about each column
   wxColour          m_textColor;

-  wxColour          m_bgColor; 
-  
+  wxColour          m_bgColor;
+

   // keep track of whether or not we should delete the image list ourselves.
   bool              m_ownsImageListNormal,
                     m_ownsImageListSmall,
   // keep track of whether or not we should delete the image list ourselves.
   bool              m_ownsImageListNormal,
                     m_ownsImageListSmall,


@@ -388,8 +403,8 @@ protected:
                                   // keep track of inserted/deleted columns
 
   int               m_count; // for virtual lists, store item count
                                   // keep track of inserted/deleted columns
 
   int               m_count; // for virtual lists, store item count

-  
-private: 
+
+private:

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };