OS/2 tweaks.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -174,6 +174,13 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
|
|||||||
int x = (int)event.GetX();
|
int x = (int)event.GetX();
|
||||||
int y = (int)event.GetY();
|
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)) &&
|
if ((x >= standardColoursRect.x && x <= (standardColoursRect.x + standardColoursRect.width)) &&
|
||||||
(y >= standardColoursRect.y && y <= (standardColoursRect.y + standardColoursRect.height)))
|
(y >= standardColoursRect.y && y <= (standardColoursRect.y + standardColoursRect.height)))
|
||||||
{
|
{
|
||||||
@@ -222,7 +229,11 @@ void wxGenericColourDialog::CalculateMeasurements()
|
|||||||
sectionSpacing = 15;
|
sectionSpacing = 15;
|
||||||
|
|
||||||
standardColoursRect.x = 10;
|
standardColoursRect.x = 10;
|
||||||
|
#ifdef __WXPM__
|
||||||
|
standardColoursRect.y = 15 + 20; /* OS/2 needs to account for dialog titlebar */
|
||||||
|
#else
|
||||||
standardColoursRect.y = 15;
|
standardColoursRect.y = 15;
|
||||||
|
#endif
|
||||||
standardColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing);
|
standardColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing);
|
||||||
standardColoursRect.height = (6*smallRectangleSize.y) + (5*gridSpacing);
|
standardColoursRect.height = (6*smallRectangleSize.y) + (5*gridSpacing);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user