Forgot to remove wxBackingFile from the changes.txt. It was kept internal

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

diff --git a/wxPython/src/_pywindows.i b/wxPython/src/_pywindows.i
index bff343eada794c67d4302bfa696b5c3c86644435..50f0e39a59b176e2fdcb3f84426eff2e3a04584b 100644 (file)
--- a/wxPython/src/_pywindows.i
+++ b/wxPython/src/_pywindows.i
@@ -49,7 +49,6 @@
 
 //---------------------------------------------------------------------------
 
-
 %{ // C++ version of Python aware wxWindow
 class wxPyWindow : public wxWindow
 {
@@ -63,8 +62,17 @@ public:
                const wxString& name = wxPyPanelNameStr)
         : wxWindow(parent, id, pos, size, style, name) {}
 
-    void SetBestSize(const wxSize& size) { wxWindow::SetBestSize(size); }
 
+    bool DoEraseBackground(wxDC* dc) {
+#ifdef __WXMSW__
+        return wxWindow::DoEraseBackground(dc->GetHDC());
+#else
+        dc->SetBackground(wxBrush(GetBackgroundColour()));
+        dc->Clear();
+        return true;
+#endif
+    }
+    
     DEC_PYCALLBACK_VOID_INT4(DoMoveWindow);
     DEC_PYCALLBACK_VOID_INT5(DoSetSize);
     DEC_PYCALLBACK_VOID_INTINT(DoSetClientSize);
@@ -94,6 +102,8 @@ public:
     
     DEC_PYCALLBACK_BOOL_(HasTransparentBackground);
 
+    DEC_PYCALLBACK_VOID_(OnInternalIdle);
+    
     PYPRIVATE;
 };
 
@@ -127,6 +137,8 @@ IMP_PYCALLBACK_BOOL_const(wxPyWindow, wxWindow, ShouldInheritColours);
 IMP_PYCALLBACK_VIZATTR_(wxPyWindow, wxWindow, GetDefaultAttributes);
 
 IMP_PYCALLBACK_BOOL_(wxPyWindow, wxWindow, HasTransparentBackground);
+
+IMP_PYCALLBACK_VOID_(wxPyWindow, wxWindow, OnInternalIdle);
 %}
 
 // And now the one for SWIG to see
@@ -147,42 +159,67 @@ public:
     
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
-
-    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,
-                        int sizeFlags = wxSIZE_AUTO);
-    void base_DoSetClientSize(int width, int height);
-    void base_DoSetVirtualSize( int x, int y );
+    %pythoncode { SetBestSize = wx.Window.SetInitialSize }
+    bool DoEraseBackground(wxDC* dc);
+    
+    void DoMoveWindow(int x, int y, int width, int height);
+    void DoSetSize(int x, int y, int width, int height,
+                   int sizeFlags = wxSIZE_AUTO);
+    void DoSetClientSize(int width, int height);
+    void DoSetVirtualSize( int x, int y );
 
     DocDeclA(
-        void, base_DoGetSize( int *OUTPUT, int *OUTPUT ) const,
-        "base_DoGetSize() -> (width, height)");
+        void, DoGetSize( int *OUTPUT, int *OUTPUT ) const,
+        "DoGetSize() -> (width, height)");
     DocDeclA(
-        void, base_DoGetClientSize( int *OUTPUT, int *OUTPUT ) const,
-        "base_DoGetClientSize() -> (width, height)");
+        void, DoGetClientSize( int *OUTPUT, int *OUTPUT ) const,
+        "DoGetClientSize() -> (width, height)");
     DocDeclA(
-        void, base_DoGetPosition( int *OUTPUT, int *OUTPUT ) const,
-        "base_DoGetPosition() -> (x,y)");
-
-    wxSize base_DoGetVirtualSize() const;
-    wxSize base_DoGetBestSize() const;
-
-    void base_InitDialog();
-    bool base_TransferDataToWindow();
-    bool base_TransferDataFromWindow();
-    bool base_Validate();
-
-    bool base_AcceptsFocus() const;
-    bool base_AcceptsFocusFromKeyboard() const;
-    wxSize base_GetMaxSize() const;
-
-    void base_AddChild(wxWindow* child);
-    void base_RemoveChild(wxWindow* child);
-
-    bool base_ShouldInheritColours() const;
-    wxVisualAttributes base_GetDefaultAttributes();
+        void, DoGetPosition( int *OUTPUT, int *OUTPUT ) const,
+        "DoGetPosition() -> (x,y)");
+
+    wxSize DoGetVirtualSize() const;
+    wxSize DoGetBestSize() const;
+
+    void InitDialog();
+    bool TransferDataToWindow();
+    bool TransferDataFromWindow();
+    bool Validate();
+
+    bool AcceptsFocus() const;
+    bool AcceptsFocusFromKeyboard() const;
+    wxSize GetMaxSize() const;
+
+    void AddChild(wxWindow* child);
+    void RemoveChild(wxWindow* child);
+
+    bool ShouldInheritColours() const;
+    wxVisualAttributes GetDefaultAttributes();
+
+    void OnInternalIdle();
+
+    %MAKE_BASE_FUNC(PyWindow, DoMoveWindow);
+    %MAKE_BASE_FUNC(PyWindow, DoSetSize);
+    %MAKE_BASE_FUNC(PyWindow, DoSetClientSize);
+    %MAKE_BASE_FUNC(PyWindow, DoSetVirtualSize);
+    %MAKE_BASE_FUNC(PyWindow, DoGetSize);
+    %MAKE_BASE_FUNC(PyWindow, DoGetClientSize);
+    %MAKE_BASE_FUNC(PyWindow, DoGetPosition);
+    %MAKE_BASE_FUNC(PyWindow, DoGetVirtualSize);
+    %MAKE_BASE_FUNC(PyWindow, DoGetBestSize);
+    %MAKE_BASE_FUNC(PyWindow, InitDialog);
+    %MAKE_BASE_FUNC(PyWindow, TransferDataToWindow);
+    %MAKE_BASE_FUNC(PyWindow, TransferDataFromWindow);
+    %MAKE_BASE_FUNC(PyWindow, Validate);
+    %MAKE_BASE_FUNC(PyWindow, AcceptsFocus);
+    %MAKE_BASE_FUNC(PyWindow, AcceptsFocusFromKeyboard);
+    %MAKE_BASE_FUNC(PyWindow, GetMaxSize);
+    %MAKE_BASE_FUNC(PyWindow, AddChild);
+    %MAKE_BASE_FUNC(PyWindow, RemoveChild);
+    %MAKE_BASE_FUNC(PyWindow, ShouldInheritColours);
+    %MAKE_BASE_FUNC(PyWindow, GetDefaultAttributes);
+    %MAKE_BASE_FUNC(PyWindow, OnInternalIdle);
+    
 };
 
 //---------------------------------------------------------------------------
@@ -207,7 +244,15 @@ public:
                const wxString& name = wxPyPanelNameStr)
         : wxPanel(parent, id, pos, size, style, name) {}
 
-    void SetBestSize(const wxSize& size) { wxPanel::SetBestSize(size); }
+    bool DoEraseBackground(wxDC* dc) {
+#ifdef __WXMSW__
+        return wxWindow::DoEraseBackground(dc->GetHDC());
+#else
+        dc->SetBackground(wxBrush(GetBackgroundColour()));
+        dc->Clear();
+        return true;
+#endif
+    }
     
 
     DEC_PYCALLBACK_VOID_INT4(DoMoveWindow);
@@ -239,6 +284,8 @@ public:
     
     DEC_PYCALLBACK_BOOL_(HasTransparentBackground);
 
+    DEC_PYCALLBACK_VOID_(OnInternalIdle);
+
     PYPRIVATE;
 };
 
@@ -272,6 +319,8 @@ IMP_PYCALLBACK_BOOL_const(wxPyPanel, wxPanel, ShouldInheritColours);
 IMP_PYCALLBACK_VIZATTR_(wxPyPanel, wxPanel, GetDefaultAttributes);
 
 IMP_PYCALLBACK_BOOL_(wxPyPanel, wxPanel, HasTransparentBackground);
+
+IMP_PYCALLBACK_VOID_(wxPyPanel, wxPanel, OnInternalIdle);
 %}
 
 // And now the one for SWIG to see
@@ -292,41 +341,66 @@ public:
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
-    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,
+    %pythoncode { SetBestSize = wx.Window.SetInitialSize }
+    bool DoEraseBackground(wxDC* dc);
+    
+    void DoMoveWindow(int x, int y, int width, int height);
+    void DoSetSize(int x, int y, int width, int height,
                         int sizeFlags = wxSIZE_AUTO);
-    void base_DoSetClientSize(int width, int height);
-    void base_DoSetVirtualSize( int x, int y );
+    void DoSetClientSize(int width, int height);
+    void DoSetVirtualSize( int x, int y );
 
     DocDeclA(
-        void, base_DoGetSize( int *OUTPUT, int *OUTPUT ) const,
-        "base_DoGetSize() -> (width, height)");
+        void, DoGetSize( int *OUTPUT, int *OUTPUT ) const,
+        "DoGetSize() -> (width, height)");
     DocDeclA(
-        void, base_DoGetClientSize( int *OUTPUT, int *OUTPUT ) const,
-        "base_DoGetClientSize() -> (width, height)");
+        void, DoGetClientSize( int *OUTPUT, int *OUTPUT ) const,
+        "DoGetClientSize() -> (width, height)");
     DocDeclA(
-        void, base_DoGetPosition( int *OUTPUT, int *OUTPUT ) const,
-        "base_DoGetPosition() -> (x,y)");
-
-    wxSize base_DoGetVirtualSize() const;
-    wxSize base_DoGetBestSize() const;
-
-    void base_InitDialog();
-    bool base_TransferDataToWindow();
-    bool base_TransferDataFromWindow();
-    bool base_Validate();
-
-    bool base_AcceptsFocus() const;
-    bool base_AcceptsFocusFromKeyboard() const;
-    wxSize base_GetMaxSize() const;
-
-    void base_AddChild(wxWindow* child);
-    void base_RemoveChild(wxWindow* child);
-
-    bool base_ShouldInheritColours() const ;
-    wxVisualAttributes base_GetDefaultAttributes();
+        void, DoGetPosition( int *OUTPUT, int *OUTPUT ) const,
+        "DoGetPosition() -> (x,y)");
+
+    wxSize DoGetVirtualSize() const;
+    wxSize DoGetBestSize() const;
+
+    void InitDialog();
+    bool TransferDataToWindow();
+    bool TransferDataFromWindow();
+    bool Validate();
+
+    bool AcceptsFocus() const;
+    bool AcceptsFocusFromKeyboard() const;
+    wxSize GetMaxSize() const;
+
+    void AddChild(wxWindow* child);
+    void RemoveChild(wxWindow* child);
+
+    bool ShouldInheritColours() const ;
+    wxVisualAttributes GetDefaultAttributes();
+
+    void OnInternalIdle();
+
+    %MAKE_BASE_FUNC(PyPanel, DoMoveWindow);
+    %MAKE_BASE_FUNC(PyPanel, DoSetSize);
+    %MAKE_BASE_FUNC(PyPanel, DoSetClientSize);
+    %MAKE_BASE_FUNC(PyPanel, DoSetVirtualSize);
+    %MAKE_BASE_FUNC(PyPanel, DoGetSize);
+    %MAKE_BASE_FUNC(PyPanel, DoGetClientSize);
+    %MAKE_BASE_FUNC(PyPanel, DoGetPosition);
+    %MAKE_BASE_FUNC(PyPanel, DoGetVirtualSize);
+    %MAKE_BASE_FUNC(PyPanel, DoGetBestSize);
+    %MAKE_BASE_FUNC(PyPanel, InitDialog);
+    %MAKE_BASE_FUNC(PyPanel, TransferDataToWindow);
+    %MAKE_BASE_FUNC(PyPanel, TransferDataFromWindow);
+    %MAKE_BASE_FUNC(PyPanel, Validate);
+    %MAKE_BASE_FUNC(PyPanel, AcceptsFocus);
+    %MAKE_BASE_FUNC(PyPanel, AcceptsFocusFromKeyboard);
+    %MAKE_BASE_FUNC(PyPanel, GetMaxSize);
+    %MAKE_BASE_FUNC(PyPanel, AddChild);
+    %MAKE_BASE_FUNC(PyPanel, RemoveChild);
+    %MAKE_BASE_FUNC(PyPanel, ShouldInheritColours);
+    %MAKE_BASE_FUNC(PyPanel, GetDefaultAttributes);
+    %MAKE_BASE_FUNC(PyPanel, OnInternalIdle);
 };
 
 //---------------------------------------------------------------------------
@@ -345,7 +419,15 @@ public:
                const wxString& name = wxPyPanelNameStr)
         : wxScrolledWindow(parent, id, pos, size, style, name) {}
 
-    void SetBestSize(const wxSize& size) { wxScrolledWindow::SetBestSize(size); }
+    bool DoEraseBackground(wxDC* dc) {
+#ifdef __WXMSW__
+        return wxWindow::DoEraseBackground(dc->GetHDC());
+#else
+        dc->SetBackground(wxBrush(GetBackgroundColour()));
+        dc->Clear();
+        return true;
+#endif
+    }
 
     DEC_PYCALLBACK_VOID_INT4(DoMoveWindow);
     DEC_PYCALLBACK_VOID_INT5(DoSetSize);
@@ -376,6 +458,8 @@ public:
     
     DEC_PYCALLBACK_BOOL_(HasTransparentBackground);
 
+    DEC_PYCALLBACK_VOID_(OnInternalIdle);
+
     PYPRIVATE;
 };
 
@@ -409,6 +493,8 @@ IMP_PYCALLBACK_BOOL_const(wxPyScrolledWindow, wxScrolledWindow, ShouldInheritCol
 IMP_PYCALLBACK_VIZATTR_(wxPyScrolledWindow, wxScrolledWindow, GetDefaultAttributes);
 
 IMP_PYCALLBACK_BOOL_(wxPyScrolledWindow, wxScrolledWindow, HasTransparentBackground);
+
+IMP_PYCALLBACK_VOID_(wxPyScrolledWindow, wxScrolledWindow, OnInternalIdle);
 %}
 
 // And now the one for SWIG to see
@@ -416,7 +502,7 @@ MustHaveApp(wxPyScrolledWindow);
 class wxPyScrolledWindow : public wxScrolledWindow
 {
 public:
-    %pythonAppend wxPyScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)"
+    %pythonAppend wxPyScrolledWindow         "self._setOORInfo(self); self._setCallbackInfo(self, PyScrolledWindow)"
     %pythonAppend wxPyScrolledWindow()       ""
 
     wxPyScrolledWindow(wxWindow* parent, const wxWindowID id=-1,
@@ -429,41 +515,67 @@ public:
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
 
-    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,
+    %pythoncode { SetBestSize = wx.Window.SetInitialSize }
+    bool DoEraseBackground(wxDC* dc);
+    
+    void DoMoveWindow(int x, int y, int width, int height);
+    void DoSetSize(int x, int y, int width, int height,
                         int sizeFlags = wxSIZE_AUTO);
-    void base_DoSetClientSize(int width, int height);
-    void base_DoSetVirtualSize( int x, int y );
+    void DoSetClientSize(int width, int height);
+    void DoSetVirtualSize( int x, int y );
 
     DocDeclA(
-        void, base_DoGetSize( int *OUTPUT, int *OUTPUT ) const,
-        "base_DoGetSize() -> (width, height)");
+        void, DoGetSize( int *OUTPUT, int *OUTPUT ) const,
+        "DoGetSize() -> (width, height)");
     DocDeclA(
-        void, base_DoGetClientSize( int *OUTPUT, int *OUTPUT ) const,
-        "base_DoGetClientSize() -> (width, height)");
+        void, DoGetClientSize( int *OUTPUT, int *OUTPUT ) const,
+        "DoGetClientSize() -> (width, height)");
     DocDeclA(
-        void, base_DoGetPosition( int *OUTPUT, int *OUTPUT ) const,
-        "base_DoGetPosition() -> (x,y)");
-
-    wxSize base_DoGetVirtualSize() const;
-    wxSize base_DoGetBestSize() const;
-
-    void base_InitDialog();
-    bool base_TransferDataToWindow();
-    bool base_TransferDataFromWindow();
-    bool base_Validate();
-
-    bool base_AcceptsFocus() const;
-    bool base_AcceptsFocusFromKeyboard() const;
-    wxSize base_GetMaxSize() const;
-
-    void base_AddChild(wxWindow* child);
-    void base_RemoveChild(wxWindow* child);
+        void, DoGetPosition( int *OUTPUT, int *OUTPUT ) const,
+        "DoGetPosition() -> (x,y)");
+
+    wxSize DoGetVirtualSize() const;
+    wxSize DoGetBestSize() const;
+
+    void InitDialog();
+    bool TransferDataToWindow();
+    bool TransferDataFromWindow();
+    bool Validate();
+
+    bool AcceptsFocus() const;
+    bool AcceptsFocusFromKeyboard() const;
+    wxSize GetMaxSize() const;
+
+    void AddChild(wxWindow* child);
+    void RemoveChild(wxWindow* child);
+
+    bool ShouldInheritColours() const;
+    wxVisualAttributes GetDefaultAttributes();
+
+    void OnInternalIdle();
+
+    %MAKE_BASE_FUNC(PyScrolledWindow, DoMoveWindow);
+    %MAKE_BASE_FUNC(PyScrolledWindow, DoSetSize);
+    %MAKE_BASE_FUNC(PyScrolledWindow, DoSetClientSize);
+    %MAKE_BASE_FUNC(PyScrolledWindow, DoSetVirtualSize);
+    %MAKE_BASE_FUNC(PyScrolledWindow, DoGetSize);
+    %MAKE_BASE_FUNC(PyScrolledWindow, DoGetClientSize);
+    %MAKE_BASE_FUNC(PyScrolledWindow, DoGetPosition);
+    %MAKE_BASE_FUNC(PyScrolledWindow, DoGetVirtualSize);
+    %MAKE_BASE_FUNC(PyScrolledWindow, DoGetBestSize);
+    %MAKE_BASE_FUNC(PyScrolledWindow, InitDialog);
+    %MAKE_BASE_FUNC(PyScrolledWindow, TransferDataToWindow);
+    %MAKE_BASE_FUNC(PyScrolledWindow, TransferDataFromWindow);
+    %MAKE_BASE_FUNC(PyScrolledWindow, Validate);
+    %MAKE_BASE_FUNC(PyScrolledWindow, AcceptsFocus);
+    %MAKE_BASE_FUNC(PyScrolledWindow, AcceptsFocusFromKeyboard);
+    %MAKE_BASE_FUNC(PyScrolledWindow, GetMaxSize);
+    %MAKE_BASE_FUNC(PyScrolledWindow, AddChild);
+    %MAKE_BASE_FUNC(PyScrolledWindow, RemoveChild);
+    %MAKE_BASE_FUNC(PyScrolledWindow, ShouldInheritColours);
+    %MAKE_BASE_FUNC(PyScrolledWindow, GetDefaultAttributes);
+    %MAKE_BASE_FUNC(PyScrolledWindow, OnInternalIdle);
 
-    bool base_ShouldInheritColours() const;
-    wxVisualAttributes base_GetDefaultAttributes();
 };