more MSDOS fixes (config file location)

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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index e3c3c53606e80b16d0bcdb4bb1daa35ed27f759d..52b214cfd4ef27b0baf8623aa3aca1985edd7073 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -7,6 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include "wx/utils.h"
 #include "wx/string.h"
 
@@ -42,14 +49,14 @@ void wxBell()
 
 void wxDisplaySize(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()+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()+1) * 25/72;
     if ( height ) 
@@ -59,43 +66,43 @@ void wxDisplaySizeMM(int *width, int *height)
 
 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();
 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
-  if ( majorVsn )
-      *majorVsn = MGL_RELEASE_MAJOR;
-  if ( minorVsn )
-      *minorVsn = MGL_RELEASE_MINOR;
+    if ( majorVsn )
+        *majorVsn = MGL_RELEASE_MAJOR;
+    if ( minorVsn )
+        *minorVsn = MGL_RELEASE_MINOR;
 
 #if defined(__UNIX__)
-  return wxMGL_UNIX;
+    return wxMGL_UNIX;
 #elif defined(__OS2__)
-  return wxMGL_OS2;
+    return wxMGL_OS2;
 #elif defined(__WIN32__)
-  return wxMGL_WIN32;
+    return wxMGL_WIN32;
+#elif defined(__DOS__)
+    return wxMGL_DOS;
+#else
+    #error Platform not supported by wxMGL!
 #endif
 }