Version

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

diff --git a/wxPython/src/_pywindows.i b/wxPython/src/_pywindows.i
index 4cc0976bd3606ad22739f1c71582d2333d6f55b6..3ecdbecc32a134db7e4fedfca1023c352442408a 100644 (file)
--- a/wxPython/src/_pywindows.i
+++ b/wxPython/src/_pywindows.i
@@ -93,6 +93,8 @@ public:
     DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground);
     DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes);
     
     DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground);
     DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes);
     

+    DEC_PYCALLBACK_BOOL_(HasTransparentBackground);
+

     PYPRIVATE;
 };
 
     PYPRIVATE;
 };
 


@@ -125,7 +127,8 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWindow, wxWindow, RemoveChild);
 IMP_PYCALLBACK_BOOL_const(wxPyWindow, wxWindow, ShouldInheritColours);
 IMP_PYCALLBACK__COLOUR(wxPyWindow, wxWindow, ApplyParentThemeBackground);
 IMP_PYCALLBACK_VIZATTR_(wxPyWindow, wxWindow, GetDefaultAttributes);
 IMP_PYCALLBACK_BOOL_const(wxPyWindow, wxWindow, ShouldInheritColours);
 IMP_PYCALLBACK__COLOUR(wxPyWindow, wxWindow, ApplyParentThemeBackground);
 IMP_PYCALLBACK_VIZATTR_(wxPyWindow, wxWindow, GetDefaultAttributes);

- 
+
+IMP_PYCALLBACK_BOOL_(wxPyWindow, wxWindow, HasTransparentBackground);

 %}
 
 // And now the one for SWIG to see
 %}
 
 // And now the one for SWIG to see


@@ -136,13 +139,13 @@ public:
     %pythonAppend wxPyWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)"
     %pythonAppend wxPyWindow()       ""
 
     %pythonAppend wxPyWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)"
     %pythonAppend wxPyWindow()       ""
 

-    wxPyWindow(wxWindow* parent, const wxWindowID id,
+    wxPyWindow(wxWindow* parent, const wxWindowID id=-1,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxString& name = wxPyPanelNameStr);
 
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxString& name = wxPyPanelNameStr);
 

-    %name(PrePyWindow) wxPyWindow();
+    %RenameCtor(PrePyWindow, wxPyWindow());

     
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
     
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 


@@ -238,6 +241,8 @@ public:
     DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground);
     DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes);
     
     DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground);
     DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes);
     

+    DEC_PYCALLBACK_BOOL_(HasTransparentBackground);
+

     PYPRIVATE;
 };
 
     PYPRIVATE;
 };
 


@@ -271,7 +276,8 @@ IMP_PYCALLBACK_BOOL_const(wxPyPanel, wxPanel, ShouldInheritColours);
 IMP_PYCALLBACK__COLOUR(wxPyPanel, wxPanel, ApplyParentThemeBackground);
 IMP_PYCALLBACK_VIZATTR_(wxPyPanel, wxPanel, GetDefaultAttributes);
 
 IMP_PYCALLBACK__COLOUR(wxPyPanel, wxPanel, ApplyParentThemeBackground);
 IMP_PYCALLBACK_VIZATTR_(wxPyPanel, wxPanel, GetDefaultAttributes);
 

- %}
+IMP_PYCALLBACK_BOOL_(wxPyPanel, wxPanel, HasTransparentBackground);
+%}

 
 // And now the one for SWIG to see
 MustHaveApp(wxPyPanel);
 
 // And now the one for SWIG to see
 MustHaveApp(wxPyPanel);


@@ -281,13 +287,13 @@ public:
     %pythonAppend wxPyPanel         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
     %pythonAppend wxPyPanel()       ""
 
     %pythonAppend wxPyPanel         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
     %pythonAppend wxPyPanel()       ""
 

-    wxPyPanel(wxWindow* parent, const wxWindowID id,
+    wxPyPanel(wxWindow* parent, const wxWindowID id=-1,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxString& name = wxPyPanelNameStr);
 
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxString& name = wxPyPanelNameStr);
 

-    %name(PrePyPanel) wxPyPanel();
+    %RenameCtor(PrePyPanel,  wxPyPanel());

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 


@@ -375,6 +381,8 @@ public:
     DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground);
     DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes);
     
     DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground);
     DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes);
     

+    DEC_PYCALLBACK_BOOL_(HasTransparentBackground);
+

     PYPRIVATE;
 };
 
     PYPRIVATE;
 };
 


@@ -408,6 +416,7 @@ IMP_PYCALLBACK_BOOL_const(wxPyScrolledWindow, wxScrolledWindow, ShouldInheritCol
 IMP_PYCALLBACK__COLOUR(wxPyScrolledWindow, wxScrolledWindow, ApplyParentThemeBackground);
 IMP_PYCALLBACK_VIZATTR_(wxPyScrolledWindow, wxScrolledWindow, GetDefaultAttributes);
 
 IMP_PYCALLBACK__COLOUR(wxPyScrolledWindow, wxScrolledWindow, ApplyParentThemeBackground);
 IMP_PYCALLBACK_VIZATTR_(wxPyScrolledWindow, wxScrolledWindow, GetDefaultAttributes);
 

+IMP_PYCALLBACK_BOOL_(wxPyScrolledWindow, wxScrolledWindow, HasTransparentBackground);

 %}
 
 // And now the one for SWIG to see
 %}
 
 // And now the one for SWIG to see


@@ -418,13 +427,13 @@ public:
     %pythonAppend wxPyScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
     %pythonAppend wxPyScrolledWindow()       ""
 
     %pythonAppend wxPyScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
     %pythonAppend wxPyScrolledWindow()       ""
 

-    wxPyScrolledWindow(wxWindow* parent, const wxWindowID id,
+    wxPyScrolledWindow(wxWindow* parent, const wxWindowID id=-1,

                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxString& name = wxPyPanelNameStr);
 
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
                const wxString& name = wxPyPanelNameStr);
 

-    %name(PrePyScrolledWindow) wxPyScrolledWindow();
+    %RenameCtor(PrePyScrolledWindow,  wxPyScrolledWindow());

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);