X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab1f7d2aa9cb1857cf87e105ebbd36a92676bbde..c0de73aebe3dcbd2ca8dc8d8d7ad6d743c05e2e8:/wxPython/src/_panel.i

diff --git a/wxPython/src/_panel.i b/wxPython/src/_panel.i
index 180bd8c8ed..0c014a92a0 100644
--- a/wxPython/src/_panel.i
+++ b/wxPython/src/_panel.i
@@ -29,6 +29,7 @@ class wxPanel : public wxWindow
 public:
     %pythonAppend wxPanel         "self._setOORInfo(self)"
     %pythonAppend wxPanel()       ""
+    %typemap(out) wxPanel*;    // turn off this typemap
 
     wxPanel(wxWindow* parent,
             const wxWindowID id=-1,
@@ -38,6 +39,9 @@ public:
             const wxString& name = wxPyPanelNameStr);
     %name(PrePanel)wxPanel();
 
+    // Turn it back on again
+    %typemap(out) wxPanel* { $result = wxPyMake_wxObject($1, $owner); }
+
     bool Create(wxWindow* parent,
                 const wxWindowID id=-1,
                 const wxPoint& pos = wxDefaultPosition,
@@ -66,6 +70,7 @@ class wxScrolledWindow : public wxPanel
 public:
     %pythonAppend wxScrolledWindow         "self._setOORInfo(self)"
     %pythonAppend wxScrolledWindow()       ""
+    %typemap(out) wxScrolledWindow*;    // turn off this typemap
 
     wxScrolledWindow(wxWindow* parent,
                      const wxWindowID id = -1,
@@ -75,6 +80,9 @@ public:
                      const wxString& name = wxPyPanelNameStr);
     %name(PreScrolledWindow)wxScrolledWindow();
 
+    // Turn it back on again
+    %typemap(out) wxScrolledWindow* { $result = wxPyMake_wxObject($1, $owner); }
+
     bool Create(wxWindow* parent,
                 const wxWindowID id = -1,
                 const wxPoint& pos = wxDefaultPosition,
@@ -163,6 +171,12 @@ public:
     wxRect GetTargetRect() const;
 #endif
 
+    // TODO: directorize this?
+    DocDeclStr(
+        virtual void , DoPrepareDC( wxDC & dc ),
+        "Normally what is called by `PrepareDC`.", "");
+
+    
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };