Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxMGL fixes (patch #884758)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-02-05 23:13:30 +00:00
parent 078c7a596d
commit 1c53456fc9
7 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/defs.h
View File

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

5
include/wx/platform.h
View File

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

2
src/common/appcmn.cpp
View File

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

21
src/generic/dirctrlg.cpp
View File

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

5
src/mgl/colour.cpp
View File

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

25
src/mgl/utils.cpp
View File

@@ -208,6 +208,8 @@ int wxDisplayDepth()
return g_displayDC->getBitsPerPixel(); return g_displayDC->getBitsPerPixel();
} }
#if wxUSE_GUI
wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
{ {
static wxToolkitInfo info; static wxToolkitInfo info;
@@ -230,6 +232,29 @@ wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
return info; 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) void wxGetMousePosition(int* x, int* y)
{ {

2
src/mgl/window.cpp
View File

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