wxBookCtrl --> wxBookCtrlBase

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

diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index 860d306be4f420bd90c043ce48a8aabe8b9a53b0..37fd6107d0be867ad0c00ebdaf9768288be95c00 100644 (file)
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -132,8 +132,8 @@ public:
 
 // None/NULL is now handled properly by the typemap, so these are not needed.
 //     %extend {
 
 // None/NULL is now handled properly by the typemap, so these are not needed.
 //     %extend {

-//         bool __eq__(const wxSize* other) { return other ? (*self == *other) : False; }
-//         bool __ne__(const wxSize* other) { return other ? (*self != *other) : True;  }
+//         bool __eq__(const wxSize* other) { return other ? (*self == *other) : false; }
+//         bool __ne__(const wxSize* other) { return other ? (*self != *other) : true;  }

 //     }
 
     DocDeclStr(
 //     }
 
     DocDeclStr(


@@ -427,7 +427,12 @@ public:
         wxRect(const wxPoint& pos, const wxSize& size),
         "Create a new Rect from a position and size.", "",
          RectPS);
         wxRect(const wxPoint& pos, const wxSize& size),
         "Create a new Rect from a position and size.", "",
          RectPS);

-    
+
+    DocCtorStrName(
+        wxRect(const wxSize& size),
+        "Create a new Rect from a size only.", "",
+         RectS);
+

     ~wxRect();
 
     int GetX() const;
     ~wxRect();
 
     int GetX() const;


@@ -576,6 +581,8 @@ bottom, otherwise it is moved to the left or top respectively.", "",
 };
 
 
 };
 
 

+MustHaveApp(wxIntersectRect);
+

 DocAStr(wxIntersectRect,
        "IntersectRect(Rect r1, Rect r2) -> Rect",
        "Calculate and return the intersection of r1 and r2.", "");
 DocAStr(wxIntersectRect,
        "IntersectRect(Rect r1, Rect r2) -> Rect",
        "Calculate and return the intersection of r1 and r2.", "");


@@ -592,7 +599,7 @@ DocAStr(wxIntersectRect,
         if (dest != wxRect(0,0,0,0)) {
             bool blocked = wxPyBeginBlockThreads();
             wxRect* newRect = new wxRect(dest);
         if (dest != wxRect(0,0,0,0)) {
             bool blocked = wxPyBeginBlockThreads();
             wxRect* newRect = new wxRect(dest);

-            obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), True);
+            obj = wxPyConstructObject((void*)newRect, wxT("wxRect"), true);

             wxPyEndBlockThreads(blocked);
             return obj;
         }
             wxPyEndBlockThreads(blocked);
             return obj;
         }