From b1f9d7bf624dcdf8eccd33d7ea5320e6f851139b Mon Sep 17 00:00:00 2001 From: David Webster Date: Mon, 22 Jul 2002 23:06:36 +0000 Subject: [PATCH] OS/2 tweaks. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/colrdlgg.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index 3b75c107b5..952a1ebddd 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -174,6 +174,13 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event) int x = (int)event.GetX(); int y = (int)event.GetY(); +#ifdef __WXPM__ + // Handle OS/2's reverse coordinate system and account for the dialog title + int nClientHeight; + + GetClientSize(NULL, &nClientHeight); + y = (nClientHeight - y) + 20; +#endif if ((x >= standardColoursRect.x && x <= (standardColoursRect.x + standardColoursRect.width)) && (y >= standardColoursRect.y && y <= (standardColoursRect.y + standardColoursRect.height))) { @@ -222,7 +229,11 @@ void wxGenericColourDialog::CalculateMeasurements() sectionSpacing = 15; standardColoursRect.x = 10; +#ifdef __WXPM__ + standardColoursRect.y = 15 + 20; /* OS/2 needs to account for dialog titlebar */ +#else standardColoursRect.y = 15; +#endif standardColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing); standardColoursRect.height = (6*smallRectangleSize.y) + (5*gridSpacing); -- 2.45.2