Added wx.Window.GetScreenPosition and GetScreenRect

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index f441350fc1d81ae83bdbc0acac886ff3a518f0fe..0fe14ef08b9e02111ae77dfb438023ec659315b1 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -109,6 +109,10 @@ Bumped up to SWIG 1.3.29.  This provides some more runtime performance
 boosts, gets rid of the dreaded Ptr classes, and some other nice new
 things. 
 
 boosts, gets rid of the dreaded Ptr classes, and some other nice new
 things. 
 

+Added wx.Window.GetScreenPosition and GetScreenRect which returns the
+position of the window in screen coordinates, even if the window is
+not a top-level window.
+

 
 
 
 
 
 

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 6c9381ed1f9acf78eeb99d9fbe4f480f1ba6ff14..ce794e13bc8bac0e4f13e46b0eb5a7c12207de65 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -460,14 +460,32 @@ around panel items, for example.", "");
 
 
     DocStr(GetPosition,   // sets the docstring for both
 
 
     DocStr(GetPosition,   // sets the docstring for both

-           "Get the window's position.", "");
-    wxPoint GetPosition();
+           "Get the window's position.  Notice that the position is in client
+coordinates for child windows and screen coordinates for the top level
+ones, use `GetScreenPosition` if you need screen coordinates for all
+kinds of windows.", "");
+    wxPoint GetPosition() const;

 
     DocDeclAName(
 
     DocDeclAName(

-        void, GetPosition(int *OUTPUT, int *OUTPUT),
+        void, GetPosition(int *OUTPUT, int *OUTPUT) const,

         "GetPositionTuple() -> (x,y)",
         GetPositionTuple);
 
         "GetPositionTuple() -> (x,y)",
         GetPositionTuple);
 

+    
+    DocStr(GetScreenPosition,   // sets the docstring for both
+           "Get the position of the window in screen coordinantes.", "");
+    wxPoint GetScreenPosition() const;
+    DocDeclAName(
+        void, GetScreenPosition(int *OUTPUT, int *OUTPUT) const,
+        "GetScreenPositionTuple() -> (x,y)",
+        GetScreenPositionTuple);
+
+    DocDeclStr(
+        wxRect , GetScreenRect() const,
+        "Returns the size and position of the window in screen coordinantes as
+a `wx.Rect` object.", "
+:see: `GetRect`, `GetScreenPosition`");
+    

    
     DocStr(GetSize, "Get the window size.", "");
     wxSize GetSize() const;
    
     DocStr(GetSize, "Get the window size.", "");
     wxSize GetSize() const;


@@ -480,7 +498,7 @@ around panel items, for example.", "");
 
     DocDeclStr(
         wxRect , GetRect() const,
 
     DocDeclStr(
         wxRect , GetRect() const,

-        "Returns the size and position of the window as a wx.Rect object.", "");
+        "Returns the size and position of the window as a `wx.Rect` object.", "");

     
 
     DocStr(GetClientSize,
     
 
     DocStr(GetClientSize,