]> git.saurik.com Git - wxWidgets.git/commitdiff
make wxGenericCollapsiblePane a wxControlContainer to allow keyboard navigation to...
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 11 Feb 2008 01:24:19 +0000 (01:24 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 11 Feb 2008 01:24:19 +0000 (01:24 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/collpaneg.h
src/generic/collpaneg.cpp

index 09aa1e08b063e3c5ae23e07a80e2efa14cd486c4..01a782ae129facf6699d3d08aad8370d5df6e601 100644 (file)
@@ -19,6 +19,8 @@ class WXDLLIMPEXP_FWD_CORE wxStaticLine;
 class WXDLLIMPEXP_FWD_CORE wxDisclosureTriangle;
 #endif
 
+#include "wx/containr.h"
+
 // ----------------------------------------------------------------------------
 // wxGenericCollapsiblePane
 // ----------------------------------------------------------------------------
@@ -42,15 +44,7 @@ public:
         Create(parent, winid, label, pos, size, style, val, name);
     }
 
-    void Init()
-    {
-        m_pButton = NULL;
-        m_pPane = NULL;
-        m_pStaticLine = NULL;
-        m_sz = NULL;
-    }
-
-    ~wxGenericCollapsiblePane();
+    virtual ~wxGenericCollapsiblePane();
 
     bool Create(wxWindow *parent,
                 wxWindowID winid,
@@ -98,10 +92,13 @@ protected:
     wxString m_strLabel;
 
 private:
+    void Init();
+
     // event handlers
     void OnButton(wxCommandEvent &ev);
     void OnSize(wxSizeEvent &ev);
 
+    WX_DECLARE_CONTROL_CONTAINER();
     DECLARE_DYNAMIC_CLASS(wxGenericCollapsiblePane)
     DECLARE_EVENT_TABLE()
 };
index db24dbd952c053a623ecb10c25de4cfd5100bb8f..ac01c8942c0b6bd0c7d6657e7d8c51151c556568 100644 (file)
@@ -52,8 +52,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 BEGIN_EVENT_TABLE(wxGenericCollapsiblePane, wxControl)
     EVT_BUTTON(wxID_ANY, wxGenericCollapsiblePane::OnButton)
     EVT_SIZE(wxGenericCollapsiblePane::OnSize)
+
+    WX_EVENT_TABLE_CONTROL_CONTAINER(wxGenericCollapsiblePane)
 END_EVENT_TABLE()
 
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxGenericCollapsiblePane, wxControl)
+
+void wxGenericCollapsiblePane::Init()
+{
+    WX_INIT_CONTROL_CONTAINER();
+
+    m_pButton = NULL;
+    m_pPane = NULL;
+    m_pStaticLine = NULL;
+    m_sz = NULL;
+}
 
 bool wxGenericCollapsiblePane::Create(wxWindow *parent,
                                       wxWindowID id,