added missing generic include file

[wxWidgets.git] / wxPython / src / sizers.i

diff --git a/wxPython/src/sizers.i b/wxPython/src/sizers.i
index 446de4c3adb16ff2068118b55109bd9fccfad0ac..74f92b4d469d929a92cbd2ceb9ad46244aae89cd 100644 (file)
--- a/wxPython/src/sizers.i
+++ b/wxPython/src/sizers.i
@@ -14,6 +14,8 @@
 
 %{
 #include "helpers.h"
 
 %{
 #include "helpers.h"

+
+#include <wx/notebook.h>

 %}
 
 //----------------------------------------------------------------------
 %}
 
 //----------------------------------------------------------------------


@@ -33,7 +35,7 @@
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 
 

-class wxSizerItem {
+class wxSizerItem : public wxObject {

 public:
     // No need to ever create one directly in Python...
 
 public:
     // No need to ever create one directly in Python...
 


@@ -41,6 +43,7 @@ public:
     //wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );
     //wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
 
     //wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );
     //wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
 

+    wxPoint GetPosition();

     wxSize GetSize();
     wxSize CalcMin();
     void SetDimension( wxPoint pos, wxSize size );
     wxSize GetSize();
     wxSize CalcMin();
     void SetDimension( wxPoint pos, wxSize size );


@@ -85,7 +88,7 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-class wxSizer {
+class wxSizer : public wxObject {

 public:
     // wxSizer();      ****  abstract, can't instantiate
     // ~wxSizer();
 public:
     // wxSizer();      ****  abstract, can't instantiate
     // ~wxSizer();


@@ -159,37 +162,37 @@ public:
 
 
     %pragma(python) addtoclass = "
 
 
     %pragma(python) addtoclass = "

-    def Add(self, *args):
+    def Add(self, *args, **kw):

         if type(args[0]) == type(1):
         if type(args[0]) == type(1):

-            apply(self.AddSpacer, args)
+            apply(self.AddSpacer, args, kw)

         elif string.find(args[0].this, 'Sizer') != -1:
         elif string.find(args[0].this, 'Sizer') != -1:

-            apply(self.AddSizer, args)
+            apply(self.AddSizer, args, kw)

         else:
         else:

-            apply(self.AddWindow, args)
+            apply(self.AddWindow, args, kw)

 
 

-    def Insert(self, *args):
-        if type(args[0]) == type(1):
-            apply(self.InsertSpacer, args)
-        elif string.find(args[0].this, 'Sizer') != -1:
-            apply(self.InsertSizer, args)
+    def Insert(self, *args, **kw):
+        if type(args[1]) == type(1):
+            apply(self.InsertSpacer, args, kw)
+        elif string.find(args[1].this, 'Sizer') != -1:
+            apply(self.InsertSizer, args, kw)

         else:
         else:

-            apply(self.InsertWindow, args)
+            apply(self.InsertWindow, args, kw)

 
 

-    def Prepend(self, *args):
+    def Prepend(self, *args, **kw):

         if type(args[0]) == type(1):
         if type(args[0]) == type(1):

-            apply(self.PrependSpacer, args)
+            apply(self.PrependSpacer, args, kw)

         elif string.find(args[0].this, 'Sizer') != -1:
         elif string.find(args[0].this, 'Sizer') != -1:

-            apply(self.PrependSizer, args)
+            apply(self.PrependSizer, args, kw)

         else:
         else:

-            apply(self.PrependWindow, args)
+            apply(self.PrependWindow, args, kw)

 
 

-    def Remove(self, *args):
+    def Remove(self, *args, **kw):

         if type(args[0]) == type(1):
         if type(args[0]) == type(1):

-            apply(self.RemovePos, args)
+            apply(self.RemovePos, args, kw)

         elif string.find(args[0].this, 'Sizer') != -1:
         elif string.find(args[0].this, 'Sizer') != -1:

-            apply(self.RemoveSizer, args)
+            apply(self.RemoveSizer, args, kw)

         else:
         else:

-            apply(self.RemoveWindow, args)
+            apply(self.RemoveWindow, args, kw)

 
     def AddMany(self, widgets):
         for childinfo in widgets:
 
     def AddMany(self, widgets):
         for childinfo in widgets: