move the include of collpane.h to the main header

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h
index 4efa244ecce73a445f93787850d09aa141ad8b7d..410445cd8748625f7859f084cdd4fdfe03d66cbf 100644 (file)
--- a/wxPython/include/wx/wxPython/wxPython_int.h
+++ b/wxPython/include/wx/wxPython/wxPython_int.h
@@ -78,6 +78,7 @@
 #include <wx/clrpicker.h>
 #include <wx/filepicker.h>
 #include <wx/fontpicker.h>    
 #include <wx/clrpicker.h>
 #include <wx/filepicker.h>
 #include <wx/fontpicker.h>    

+#include <wx/collpane.h>

 
 
 #ifdef _MSC_VER
 
 
 #ifdef _MSC_VER

diff --git a/wxPython/src/_collpane.i b/wxPython/src/_collpane.i
index 58ba3fa13f4e43b8a4ca079d7d45b829323777f4..6e79eb3d6f2cccd1de3d2b6a3c59475fa64c18bc 100644 (file)
--- a/wxPython/src/_collpane.i
+++ b/wxPython/src/_collpane.i
@@ -16,10 +16,6 @@
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

-%{
-#include <wx/collpane.h>
-%}
-

 MAKE_CONST_WXSTRING(CollapsiblePaneNameStr);
 
 enum {
 MAKE_CONST_WXSTRING(CollapsiblePaneNameStr);
 
 enum {


@@ -107,7 +103,9 @@ public:
         virtual wxWindow *, GetPane() const,
         "Returns a reference to the pane window.  Use the returned `wx.Window`
 as the parent of widgets to make them part of the collapsible area.", "");
         virtual wxWindow *, GetPane() const,
         "Returns a reference to the pane window.  Use the returned `wx.Window`
 as the parent of widgets to make them part of the collapsible area.", "");

-    
+
+    %property(Expanded, IsExpanded);
+    %property(Collapsed, IsCollapsed);

 };
 
 
 };
 
 


@@ -128,6 +126,8 @@ public:
 
     bool GetCollapsed() const;
     void SetCollapsed(bool c);
 
     bool GetCollapsed() const;
     void SetCollapsed(bool c);

+
+    %property(Collapsed, GetCollapsed, SetCollapsed);

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------