query MGL for resolution

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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 2408e47e2f378d4e64410b46f1f36a1b6503ef51..34930515dfa180e623aff83bad7d452cb668a264 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -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") );
 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 ) 
     if ( width ) 

-        *width = (g_displayDC->sizex()+1) * 25/72;
+        *width = (int)((g_displayDC->sizex()+1) * 25.4 / xDPI);

     if ( height ) 
     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)
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)