Various wxCollapsiblePane enhancements (re-patch 1577412):

1. wxUSE_COLLPANE added 2. XRC handler added 3. flicker fixes for the generic version 4. sizing fixes for GTK+ version 5. RTL fixes for the generic version (via wxBoxSizer) 6. better appearance under Mac for the generic version git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 20:08:17 +00:00
parent a4c8fc2374
commit 912c39325b
32 changed files with 609 additions and 86 deletions
--- a/src/xrc/xh_collpane.cpp
+++ b/src/xrc/xh_collpane.cpp
@@ -0,0 +1,96 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/xrc/xh_collpane.cpp
+// Purpose:     XML resource handler for wxCollapsiblePane
+// Author:      Francesco Montorsi
+// Created:     2006-10-27
+// RCS-ID:      $Id$
+// Copyright:   (c) 2006 Francesco Montorsi
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if wxUSE_XRC && wxUSE_COLLPANE
+
+#include "wx/xrc/xh_collpane.h"
+#include "wx/collpane.h"
+
+IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler, wxXmlResourceHandler)
+
+wxCollapsiblePaneXmlHandler::wxCollapsiblePaneXmlHandler() : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxCP_NO_TLW_RESIZE);
+    XRC_ADD_STYLE(wxCP_DEFAULT_STYLE);
+    AddWindowStyles();
+}
+
+wxObject *wxCollapsiblePaneXmlHandler::DoCreateResource()
+{
+    if (m_class == wxT("panewindow"))   // read the XRC for the pane window
+    {
+        wxXmlNode *n = GetParamNode(wxT("object"));
+
+        if ( !n )
+            n = GetParamNode(wxT("object_ref"));
+
+        if (n)
+        {
+            bool old_ins = m_isInside;
+            m_isInside = false;
+            wxObject *item = CreateResFromNode(n, m_collpane->GetPane(), NULL);
+            m_isInside = old_ins;
+
+            return item;
+        }
+        else
+        {
+            wxLogError(wxT("Error in resource: no control within collapsible pane's <panewindow> tag."));
+            return NULL;
+        }
+    }
+    else
+    {
+        XRC_MAKE_INSTANCE(ctrl, wxCollapsiblePane)
+
+        wxString label = GetParamValue(wxT("label"));
+        if (label.empty())
+        {
+            wxLogError(wxT("Error in resource: empty label for wxCollapsiblePane"));
+            return NULL;
+        }
+
+        ctrl->Create(m_parentAsWindow,
+                    GetID(),
+                    label,
+                    GetPosition(), GetSize(),
+                    GetStyle(_T("style"), wxCP_DEFAULT_STYLE),
+                    wxDefaultValidator,
+                    GetName());
+
+        ctrl->Collapse(GetBool(_T("collapsed")));
+        SetupWindow(ctrl);
+
+        wxCollapsiblePane *old_par = m_collpane;
+        m_collpane = ctrl;
+        bool old_ins = m_isInside;
+        m_isInside = true;
+        CreateChildren(m_collpane, true/*only this handler*/);
+        m_isInside = old_ins;
+        m_collpane = old_par;
+
+        return ctrl;
+    }
+}
+
+bool wxCollapsiblePaneXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxT("wxCollapsiblePane")) ||
+            (m_isInside && IsOfClass(node, wxT("panewindow")));
+}
+
+#endif // wxUSE_XRC && wxUSE_COLLPANE