explicitly forward declare wxHashTableBase when wxUSE_STL == 1; this is apparently...

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

diff --git a/wxPython/src/_panel.i b/wxPython/src/_panel.i
index 180bd8c8ed950f32fe2b0fb4c6ae0b63b5b9f76d..a78146d4f0a1477ba91873ecd83c5e076118cc42 100644 (file)
--- 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,
@@ -87,7 +95,7 @@ public:
     virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
                                int noUnitsX, int noUnitsY,
                                int xPos = 0, int yPos = 0,
-                               bool noRefresh = False );
+                               bool noRefresh = false );
 
     // scroll to the given (in logical coords) position
     virtual void Scroll(int x, int y);
@@ -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);
 };