compilation warning fix

[wxWidgets.git] / src / mgl / utils.cpp

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 3017bbf4f3c7b0141440449a47a4cd15ff17f044..6459d48004dab77f1b7c4d9e84c4e004f1594912 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -42,43 +42,39 @@ void wxBell()
 
 void wxDisplaySize(int *width, int *height)
 {
-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
-    if (width) *width = g_displayDC->sizex();
-    if (height) *height = g_displayDC->sizey();
+    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
+    if (width) *width = g_displayDC->sizex()+1;
+    if (height) *height = g_displayDC->sizey()+1;
 }
 
 void wxDisplaySizeMM(int *width, int *height)
 {
-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
+    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
     if ( width ) 
-        *width = g_displayDC->sizex() * 25/72;
+        *width = (g_displayDC->sizex()+1) * 25/72;
     if ( height ) 
-        *height = g_displayDC->sizey() * 25/72;
+        *height = (g_displayDC->sizey()+1) * 25/72;
     // FIXME_MGL -- what about returning *real* monitor dimensions?
 }
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
-    // This is supposed to return desktop dimensions minus any window
-    // manager panels, menus, taskbars, etc.  If there is a way to do that
-    // for this platform please fix this function, otherwise it defaults
-    // to the entire desktop.
-    if (x) *x = 0;
-    if (y) *y = 0;
+    if ( x ) *x = 0;
+    if ( y ) *y = 0;
     wxDisplaySize(width, height);
-    // FIXME_MGL -- make it use wxDesktop class when there's one
+    // FIXME_MGL - windowed version needs different handling
 }
 
 bool wxColourDisplay()
 {
-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
+    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
     
     return (wxDisplayDepth() > 1);
 }
 
 int wxDisplayDepth()
 {
-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
+    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
 
     return g_displayDC->getBitsPerPixel();
 }