bitwise vs. logical operator

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

diff --git a/wxPython/src/_panel.i b/wxPython/src/_panel.i
index 02a33ca1557a70a1615fe5b0b80e4b87ad0e84e2..6dc14e0f6f2fa676ebcd88d6b812beaa0e008f00 100644 (file)
--- a/wxPython/src/_panel.i
+++ b/wxPython/src/_panel.i
@@ -37,7 +37,7 @@ public:
             const wxSize& size = wxDefaultSize,
             long style = wxTAB_TRAVERSAL | wxNO_BORDER,
             const wxString& name = wxPyPanelNameStr);
-    %name(PrePanel)wxPanel();
+    %RenameCtor(PrePanel, wxPanel());
 
     // Turn it back on again
     %typemap(out) wxPanel* { $result = wxPyMake_wxObject($1, $owner); }
@@ -54,12 +54,11 @@ public:
 
     DocDeclStr(
         virtual void , SetFocus(),
-        "Overrides `wx.Window.SetFocus`.  This method
-uses the (undocumented) mix-in class wxControlContainer which manages
-the focus and TAB logic for controls which usually have child controls.
-In practice, if you call this method and the panel has at least
-one child window, then the focus will be given to the child window.
-", "
+        "Overrides `wx.Window.SetFocus`.  This method uses the (undocumented)
+mix-in class wxControlContainer which manages the focus and TAB logic
+for controls which usually have child controls.  In practice, if you
+call this method and the panel has at least one child window, then the
+focus will be given to the child window.", "
 :see: `wx.FocusEvent`, `wx.Window.SetFocus`, `SetFocusIgnoringChildren`");
     
 
@@ -97,7 +96,7 @@ public:
                      const wxSize& size = wxDefaultSize,
                      long style = wxHSCROLL | wxVSCROLL,
                      const wxString& name = wxPyPanelNameStr);
-    %name(PreScrolledWindow)wxScrolledWindow();
+    %RenameCtor(PreScrolledWindow, wxScrolledWindow());
 
     // Turn it back on again
     %typemap(out) wxScrolledWindow* { $result = wxPyMake_wxObject($1, $owner); }
@@ -123,6 +122,10 @@ public:
     int GetScrollPageSize(int orient) const;
     void SetScrollPageSize(int orient, int pageSize);
 
+//     // get the number of lines the window can scroll, 
+//     // returns 0 if no scrollbars are there.
+//     int GetScrollLines( int orient ) const;
+    
     // Set the x, y scrolling increments.
     void SetScrollRate( int xstep, int ystep );
 
@@ -198,6 +201,11 @@ public:
     
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+    
+    %property(ScaleX, GetScaleX, doc="See `GetScaleX`");
+    %property(ScaleY, GetScaleY, doc="See `GetScaleY`");
+    %property(TargetWindow, GetTargetWindow, SetTargetWindow, doc="See `GetTargetWindow` and `SetTargetWindow`");
+    %property(ViewStart, GetViewStart, doc="See `GetViewStart`");
 };