X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e351786c57ce441b8b7272b552dbd4e79091012..bbc3925a8a46e8c80b22277f5571dfb2465aca25:/src/mgl/utils.cpp diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp index 78693a2a69..34930515df 100644 --- a/src/mgl/utils.cpp +++ b/src/mgl/utils.cpp @@ -3,7 +3,7 @@ // Purpose: // Author: Vaclav Slavik // Id: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -175,11 +175,14 @@ void wxDisplaySize(int *width, int *height) void wxDisplaySizeMM(int *width, int *height) { wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") ); + + int xDPI, yDPI; + MGL_getDotsPerInch(&xDPI, &yDPI); + if ( width ) - *width = (g_displayDC->sizex()+1) * 25/72; + *width = (int)((g_displayDC->sizex()+1) * 25.4 / xDPI); if ( height ) - *height = (g_displayDC->sizey()+1) * 25/72; - // FIXME_MGL -- what about returning *real* monitor dimensions? + *height = (int)((g_displayDC->sizey()+1) * 25.4 / yDPI); } void wxClientDisplayRect(int *x, int *y, int *width, int *height)