Version

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

diff --git a/wxPython/src/_pycontrol.i b/wxPython/src/_pycontrol.i
index 2037153d7007524b32bd202367b722e1f4635094..ac80519d0e0a5b27dc872fed7ddfb8cee94674a5 100644 (file)
--- a/wxPython/src/_pycontrol.i
+++ b/wxPython/src/_pycontrol.i
@@ -17,7 +17,6 @@
 %newgroup
 
 
-// TODO:  Virtualize ShouldInheritColours
 
 //---------------------------------------------------------------------------
 
@@ -35,6 +34,7 @@ public:
                 const wxString& name = wxPyControlNameStr)
         : wxControl(parent, id, pos, size, style, validator, name) {}
 
+    void SetBestSize(const wxSize& size) { wxControl::SetBestSize(size); }
 
     DEC_PYCALLBACK_VOID_INT4(DoMoveWindow);
     DEC_PYCALLBACK_VOID_INT5(DoSetSize);
@@ -60,8 +60,12 @@ public:
     DEC_PYCALLBACK_VOID_WXWINBASE(AddChild);
     DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild);
 
-    DEC_PYCALLBACK_BOOL_(ShouldInheritColours);
+    DEC_PYCALLBACK_BOOL_const(ShouldInheritColours);
+    DEC_PYCALLBACK__COLOUR(ApplyParentThemeBackground);
+    DEC_PYCALLBACK_VIZATTR_(GetDefaultAttributes);
     
+    DEC_PYCALLBACK_BOOL_(HasTransparentBackground);
+
     PYPRIVATE;
 };
 
@@ -91,26 +95,33 @@ IMP_PYCALLBACK_SIZE_const(wxPyControl, wxControl, GetMaxSize);
 IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, AddChild);
 IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, RemoveChild);
 
-IMP_PYCALLBACK_BOOL_(wxPyControl, wxControl, ShouldInheritColours);
-%}
+IMP_PYCALLBACK_BOOL_const(wxPyControl, wxControl, ShouldInheritColours);
+IMP_PYCALLBACK__COLOUR(wxPyControl, wxControl, ApplyParentThemeBackground);
+IMP_PYCALLBACK_VIZATTR_(wxPyControl, wxControl, GetDefaultAttributes);
+
+IMP_PYCALLBACK_BOOL_(wxPyControl, wxControl, HasTransparentBackground);
+ %}
 
 // And now the one for SWIG to see
+MustHaveApp(wxPyControl);
 class wxPyControl : public wxControl
 {
 public:
     %pythonAppend wxPyControl         "self._setOORInfo(self); self._setCallbackInfo(self, PyControl)"
+    %pythonAppend wxPyControl()       ""
 
-    wxPyControl(wxWindow* parent, const wxWindowID id,
+    wxPyControl(wxWindow* parent, const wxWindowID id=-1,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxValidator& validator=wxDefaultValidator,
                 const wxString& name = wxPyControlNameStr);
 
+    %RenameCtor(PrePyControl,  wxPyControl());
+    
     void _setCallbackInfo(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyControl)"
-    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
+    void SetBestSize(const wxSize& size);
 
     void base_DoMoveWindow(int x, int y, int width, int height);
     void base_DoSetSize(int x, int y, int width, int height,
@@ -142,6 +153,10 @@ public:
 
     void base_AddChild(wxWindow* child);
     void base_RemoveChild(wxWindow* child);
+
+    bool base_ShouldInheritColours() const;
+    void base_ApplyParentThemeBackground(const wxColour& c);
+    wxVisualAttributes base_GetDefaultAttributes();
 };