wxMGL fixes (patch #884758)

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

include/wx/defs.h

@@ -730,7 +730,7 @@ typedef wxUint32 wxDword;
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
     #define wxLongLongFmtSpec _T("Ld")
-#elif (defined(__WATCOMC__) && defined(__WIN32__))
+#elif (defined(__WATCOMC__) && (defined(__WIN32__) || defined(__DOS__)))
       #define wxLongLong_t __int64
       #define wxLongLongSuffix i64
       #define wxLongLongFmtSpec _T("Ld")

include/wx/platform.h

@@ -348,9 +348,10 @@
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
-#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
     defined( __CYGWIN__ ) || \
-    (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
+      (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
+    !defined(__DOS__)
 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION

src/common/appcmn.cpp

@@ -240,7 +240,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
             return FALSE;
         }
 
-        if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
+        if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
             return FALSE;
     }
 #endif // __WXMGL__

src/generic/dirctrlg.cpp

@@ -73,8 +73,8 @@
 
 #endif
 
+#if defined(__OS2__) || defined(__DOS__)
   #ifdef __OS2__
-
     #define INCL_BASE
     #include <os2.h>
     #ifndef __EMX__
@@ -82,6 +82,7 @@
     #endif
     #include <stdlib.h>
     #include <ctype.h>
+  #endif
   extern bool wxIsDriveAvailable(const wxString& dirName);
 #endif // __OS2__
 

src/mgl/colour.cpp

@@ -35,6 +35,11 @@ void wxColour::Init()
     m_isInit = false;
 }
 
+wxColour::wxColour()
+{
+    Init();
+}
+
 wxColour::wxColour(const wxColour& col)
 {
     *this = col;

src/mgl/utils.cpp

@@ -208,6 +208,8 @@ int wxDisplayDepth()
     return g_displayDC->getBitsPerPixel();
 }
 
+#if wxUSE_GUI
+
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
@@ -230,6 +232,29 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
     return info;
 }
 
+#endif
+
+wxToolkitInfo& wxConsoleAppTraits::GetToolkitInfo()
+{
+    static wxToolkitInfo info;
+    info.shortName = _T("mglbase");
+    info.versionMajor = MGL_RELEASE_MAJOR;
+    info.versionMinor = MGL_RELEASE_MINOR;
+    info.name = _T("wxBase");
+    info.os = wxGTK;
+#if defined(__UNIX__)
+    info.os = wxMGL_UNIX;
+#elif defined(__OS2__)
+    info.os = wxMGL_OS2;
+#elif defined(__WIN32__)
+    info.os = wxMGL_WIN32;
+#elif defined(__DOS__)
+    info.os = wxMGL_DOS;
+#else
+    #error Platform not supported by wxMGL!
+#endif
+    return info;
+}
 
 void wxGetMousePosition(int* x, int* y)
 {

src/mgl/window.cpp

@@ -534,7 +534,7 @@ END_EVENT_TABLE()
 // constructors and such
 // ----------------------------------------------------------------------------
 
-extern wxDisplayModeInfo wxGetDefaultDisplayMode();
+extern wxVideoMode wxGetDefaultDisplayMode();
 
 void wxWindowMGL::Init()
 {