remove DoSetSize override, unneeded after r72001

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

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index 7b2d71c6e2d639cde909e342b78f024fe19d2cbf..5bc63827fc6993ff069ad0bbc2a64332356108db 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -22,7 +22,7 @@
 
 #include "wx/control.h"
 #include "wx/treebase.h"
 
 #include "wx/control.h"
 #include "wx/treebase.h"

-#include "wx/textctrl.h" // wxTextCtrl::ms_classinfo used through CLASSINFO macro
+#include "wx/textctrl.h" // wxTextCtrl::ms_classinfo used through wxCLASSINFO macro

 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 


@@ -33,20 +33,7 @@ class WXDLLIMPEXP_FWD_CORE wxImageList;
 class WXDLLIMPEXP_CORE wxTreeCtrlBase : public wxControl
 {
 public:
 class WXDLLIMPEXP_CORE wxTreeCtrlBase : public wxControl
 {
 public:

-    wxTreeCtrlBase()
-    {
-        m_imageListNormal =
-        m_imageListState = NULL;
-        m_ownsImageListNormal =
-        m_ownsImageListState = false;
-
-        // arbitrary default
-        m_spacing = 18;
-
-        // quick DoGetBestSize calculation
-        m_quickBestSize = true;
-    }
-
+    wxTreeCtrlBase();

     virtual ~wxTreeCtrlBase();
 
     // accessors
     virtual ~wxTreeCtrlBase();
 
     // accessors


@@ -353,7 +340,7 @@ public:
         // been before. textCtrlClass parameter allows you to create an edit
         // control of arbitrary user-defined class deriving from wxTextCtrl.
     virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,
         // been before. textCtrlClass parameter allows you to create an edit
         // control of arbitrary user-defined class deriving from wxTextCtrl.
     virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,

-                      wxClassInfo* textCtrlClass = CLASSINFO(wxTextCtrl)) = 0;
+                      wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) = 0;

         // returns the same pointer as StartEdit() if the item is being edited,
         // NULL otherwise (it's assumed that no more than one item may be
         // edited simultaneously)
         // returns the same pointer as StartEdit() if the item is being edited,
         // NULL otherwise (it's assumed that no more than one item may be
         // edited simultaneously)


@@ -452,6 +439,13 @@ protected:
     bool        m_quickBestSize;
 
 
     bool        m_quickBestSize;
 
 

+private:
+    // Intercept Escape and Return keys to ensure that our in-place edit
+    // control always gets them before they're used for dialog navigation or
+    // anything else.
+    void OnCharHook(wxKeyEvent& event);
+
+

     wxDECLARE_NO_COPY_CLASS(wxTreeCtrlBase);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxTreeCtrlBase);
 };
 


@@ -461,8 +455,6 @@ protected:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/treectlg.h"
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/generic/treectlg.h"

-#elif defined(__WXPALMOS__)
-    #include "wx/generic/treectlg.h"

 #elif defined(__WXMSW__)
     #include "wx/msw/treectrl.h"
 #elif defined(__WXMOTIF__)
 #elif defined(__WXMSW__)
     #include "wx/msw/treectrl.h"
 #elif defined(__WXMOTIF__)