X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0825f0ba2bce6105c3ea550f9001921e578e36d2..9e1da4827a0ec18f9766d664b9af12c25e3f71fb:/tests/misc/guifuncs.cpp?ds=sidebyside

diff --git a/tests/misc/guifuncs.cpp b/tests/misc/guifuncs.cpp
index 27a04138dd..e63835d92f 100644
--- a/tests/misc/guifuncs.cpp
+++ b/tests/misc/guifuncs.cpp
@@ -28,6 +28,9 @@
 #include "wx/button.h"
 #include "wx/clipbrd.h"
 #include "wx/dataobj.h"
+#include "wx/panel.h"
+
+#include "asserthelper.h"
 
 // ----------------------------------------------------------------------------
 // test class
@@ -43,12 +46,14 @@ private:
         CPPUNIT_TEST( DisplaySize );
         CPPUNIT_TEST( URLDataObject );
         CPPUNIT_TEST( ParseFileDialogFilter );
+        CPPUNIT_TEST( ClientToScreen );
         CPPUNIT_TEST( FindWindowAtPoint );
     CPPUNIT_TEST_SUITE_END();
 
     void DisplaySize();
     void URLDataObject();
     void ParseFileDialogFilter();
+    void ClientToScreen();
     void FindWindowAtPoint();
 
     DECLARE_NO_COPY_CLASS(MiscGUIFuncsTestCase)
@@ -134,61 +139,135 @@ void MiscGUIFuncsTestCase::ParseFileDialogFilter()
     );
 }
 
+void MiscGUIFuncsTestCase::ClientToScreen()
+{
+    wxWindow* const tlw = wxTheApp->GetTopWindow();
+    CPPUNIT_ASSERT( tlw );
+
+    wxPanel* const
+        p1 = new wxPanel(tlw, wxID_ANY, wxPoint(0, 0), wxSize(100, 50));
+    wxPanel* const
+        p2 = new wxPanel(tlw, wxID_ANY, wxPoint(0, 50), wxSize(100, 50));
+    wxWindow* const
+        b = new wxWindow(p2, wxID_ANY, wxPoint(10, 10), wxSize(30, 10));
+
+    // We need this to realize the windows created above under wxGTK.
+    wxYield();
+
+    const wxPoint tlwOrig = tlw->ClientToScreen(wxPoint(0, 0));
+
+    CPPUNIT_ASSERT_EQUAL
+    (
+        tlwOrig + wxPoint(0, 50),
+        p2->ClientToScreen(wxPoint(0, 0))
+    );
+
+    CPPUNIT_ASSERT_EQUAL
+    (
+        tlwOrig + wxPoint(10, 60),
+        b->ClientToScreen(wxPoint(0, 0))
+    );
+
+    p1->Destroy();
+    p2->Destroy();
+}
+
+namespace
+{
+
+// This class is used as a test window here. We can't use a real wxButton
+// because we can't create other windows as its children in wxGTK.
+class TestButton : public wxWindow
+{
+public:
+    TestButton(wxWindow* parent, const wxString& label, const wxPoint& pos)
+        : wxWindow(parent, wxID_ANY, pos, wxSize(100, 50))
+    {
+        SetLabel(label);
+    }
+};
+
+// Helper function returning the label of the window at the given point or
+// "NONE" if there is no window there.
+wxString GetLabelOfWindowAtPoint(wxWindow* parent, int x, int y)
+{
+    wxWindow* const
+        win = wxFindWindowAtPoint(parent->ClientToScreen(wxPoint(x, y)));
+    return win ? win->GetLabel() : wxString("NONE");
+}
+
+} // anonymous namespace
+
 void MiscGUIFuncsTestCase::FindWindowAtPoint()
 {
     wxWindow* const parent = wxTheApp->GetTopWindow();
     CPPUNIT_ASSERT( parent );
 
-    CPPUNIT_ASSERT_MESSAGE
+    // Set a label to allow distinguishing it from the other windows in the
+    // assertion messages.
+    parent->SetLabel("parent");
+
+    wxWindow* btn1 = new TestButton(parent, "1", wxPoint(10, 10));
+    wxWindow* btn2 = new TestButton(parent, "2", wxPoint(10, 90));
+    wxWindow* btn3 = new TestButton(btn2, "3", wxPoint(20, 20));
+
+    // We need this to realize the windows created above under wxGTK.
+    wxYield();
+
+    CPPUNIT_ASSERT_EQUAL_MESSAGE
     (
         "No window for a point outside of the window",
-        !wxFindWindowAtPoint(parent->ClientToScreen(wxPoint(900, 900)))
+        "NONE",
+        GetLabelOfWindowAtPoint(parent, 900, 900)
     );
 
-    wxWindow* btn1 = new wxButton(parent, wxID_ANY, "1", wxPoint(10, 10));
     CPPUNIT_ASSERT_EQUAL_MESSAGE
     (
         "Point over a child control corresponds to it",
-        btn1,
-        wxFindWindowAtPoint(parent->ClientToScreen(wxPoint(11, 11)))
+        btn1->GetLabel(),
+        GetLabelOfWindowAtPoint(parent, 11, 11)
     );
 
     CPPUNIT_ASSERT_EQUAL_MESSAGE
     (
         "Point outside of any child control returns the TLW itself",
-        parent,
-        wxFindWindowAtPoint(parent->ClientToScreen(wxPoint(5, 5)))
+        parent->GetLabel(),
+        GetLabelOfWindowAtPoint(parent, 5, 5)
     );
 
-    wxWindow* btn2 = new wxButton(parent, wxID_ANY, "2", wxPoint(10, 90));
     btn2->Disable();
     CPPUNIT_ASSERT_EQUAL_MESSAGE
     (
         "Point over a disabled child control still corresponds to it",
-        btn2,
-        wxFindWindowAtPoint(parent->ClientToScreen(wxPoint(11, 91)))
+        btn2->GetLabel(),
+        GetLabelOfWindowAtPoint(parent, 11, 91)
     );
 
     btn2->Hide();
     CPPUNIT_ASSERT_EQUAL_MESSAGE
     (
         "Point over a hidden child control doesn't take it into account",
-        parent,
-        wxFindWindowAtPoint(parent->ClientToScreen(wxPoint(11, 91)))
+        parent->GetLabel(),
+        GetLabelOfWindowAtPoint(parent, 11, 91)
     );
 
     btn2->Show();
-    wxWindow* btn3 = new wxButton(btn2, wxID_ANY, "3", wxPoint(0, 0));
+    CPPUNIT_ASSERT_EQUAL_MESSAGE
+    (
+        "Point over child control corresponds to the child",
+        btn3->GetLabel(),
+        GetLabelOfWindowAtPoint(parent, 31, 111)
+    );
+
     btn3->Disable();
     CPPUNIT_ASSERT_EQUAL_MESSAGE
     (
-        "Point over recursive disabled child controls corresponds to deepest child",
-        btn3,
-        wxFindWindowAtPoint(parent->ClientToScreen(wxPoint(11, 91)))
+        "Point over disabled child controls still corresponds to this child",
+        btn3->GetLabel(),
+        GetLabelOfWindowAtPoint(parent, 31, 111)
     );
-    wxASSERT(wxFindWindowAtPoint(parent->ClientToScreen(wxPoint(11, 91))) == btn3);
 
-    wxDELETE(btn1);
-    wxDELETE(btn3);     // delete child before parent
-    wxDELETE(btn2);
+    btn1->Destroy();
+    btn2->Destroy();
+    // btn3 was already deleted when its parent was
 }