Add ctor parameters to match wxTextCtrl

[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 0b62528075ccf8f940d051953f017bb5ba5312df..9dbab2222362a84a8f29d3e75fb8f013f1db982e 100644 (file)
--- a/include/wx/mac/carbon/listctrl.h
+++ b/include/wx/mac/carbon/listctrl.h
@@ -16,6 +16,8 @@
 
 class wxMacDataBrowserListCtrlControl;
 class wxMacListControl;
 
 class wxMacDataBrowserListCtrlControl;
 class wxMacListControl;

+class wxListCtrlTextCtrlWrapper;
+class wxListCtrlRenameTimer;

 
 WX_DECLARE_EXPORTED_LIST(wxListItem, wxColumnList);
 
 
 WX_DECLARE_EXPORTED_LIST(wxListItem, wxColumnList);
 


@@ -318,6 +320,25 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   virtual bool SetBackgroundColour(const wxColour& colour);
   virtual wxColour GetBackgroundColour();
   
   virtual bool SetBackgroundColour(const wxColour& colour);
   virtual wxColour GetBackgroundColour();
   

+  // functions for editing/timer
+  void OnRenameTimer();
+  bool OnRenameAccept(long itemEdit, const wxString& value);
+  void OnRenameCancelled(long itemEdit);
+
+  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 FinishEditing(wxTextCtrl *text)
+  {
+      delete text;
+      m_textctrlWrapper = NULL;
+      SetFocus();
+  }
+  

   // 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 
   // 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 


@@ -331,6 +352,11 @@ protected:
                          int width, int height,
                          int sizeFlags = wxSIZE_AUTO);
 
                          int width, int height,
                          int sizeFlags = wxSIZE_AUTO);
 

+  virtual wxSize DoGetBestSize() const;
+
+  long               m_current;
+  wxListCtrlTextCtrlWrapper *m_textctrlWrapper;
+  wxListCtrlRenameTimer *m_renameTimer;

   // common part of all ctors
   void Init();
   
   // common part of all ctors
   void Init();
   


@@ -362,6 +388,9 @@ 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: 
+  DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif