#include "wx/dialog.h"
#include "wx/log.h"
#include "wx/intl.h"
+ #include "wx/resource.h"
#endif
#include "wx/app.h"
#include "wx/univ/theme.h"
#include "wx/univ/renderer.h"
#include "wx/univ/colschem.h"
+#include "wx/sysopt.h"
#include "wx/mgl/private.h"
-#define MGL_DEBUG
-
-#if defined(MGL_DEBUG) && !defined(__WXDEBUG__)
-#undef MGL_DEBUG
-#endif
-
//-----------------------------------------------------------------------------
// Global data
//-----------------------------------------------------------------------------
// MGL initialization
//-----------------------------------------------------------------------------
-static bool wxCreateMGL_WM()
+static bool wxCreateMGL_WM(const wxDisplayModeInfo& displayMode)
{
int mode;
- int width = 640, height = 480, depth = 16;
int refresh = MGL_DEFAULT_REFRESH;
#if wxUSE_SYSTEM_OPTIONS
- if ( wxSystemOptions::HasOption(wxT("mgl.screen-refresh") )
+ if ( wxSystemOptions::HasOption(wxT("mgl.screen-refresh")) )
refresh = wxSystemOptions::GetOptionInt(wxT("mgl.screen-refresh"));
#endif
- mode = MGL_findMode(width, height, depth);
+ mode = MGL_findMode(displayMode.GetWidth(),
+ displayMode.GetHeight(),
+ displayMode.GetDepth());
if ( mode == -1 )
{
- wxLogWarning(_("Mode %ix%i-%i not available, falling back to default mode."), width, height, depth);
- mode = 0; // always available
+ wxLogError(_("Mode %ix%i-%i not available."),
+ displayMode.GetWidth(),
+ displayMode.GetHeight(),
+ displayMode.GetDepth());
+ return FALSE;
}
g_displayDC = new MGLDisplayDC(mode, 1, refresh);
if ( !g_displayDC->isValid() )
g_winMng = MGL_wmCreate(g_displayDC->getDC());
if (!g_winMng)
return FALSE;
-
+
return TRUE;
}
{
}
-bool wxApp::OnInitGui()
+bool wxApp::SetDisplayMode(const wxDisplayModeInfo& mode)
{
- if ( !wxCreateMGL_WM() )
+ if ( !mode.IsOk() )
+ {
+ return FALSE;
+ }
+ if ( g_displayDC != NULL )
+ {
+ // FIXME_MGL -- we currently don't allow to switch video mode
+ // more than once. This can hopefully be changed...
+ wxFAIL_MSG(wxT("Can't change display mode after intialization!"));
return FALSE;
+ }
- // This has to be done *after* wxCreateMGL_WM() because it initializes
- // wxUniv's themes
- if ( !wxAppBase::OnInitGui() )
+ if ( !wxCreateMGL_WM(mode) )
return FALSE;
-
- // ...and this has to be done after wxUniv themes were initialized
gs_rootWindow = new wxRootWindow;
-#ifdef MGL_DEBUG
- // That damn MGL redirects stdin and stdout to physical console
- FILE *file = fopen("stderr", "wt");
- wxLog::SetActiveTarget(new wxLogStderr(file));
+ m_displayMode = mode;
+
+ return TRUE;
+}
+
+bool wxApp::OnInitGui()
+{
+ if ( !wxAppBase::OnInitGui() )
+ return FALSE;
+
+#ifdef __WXDEBUG__
+ // MGL redirects stdout and stderr to physical console, so lets redirect
+ // it to file. Do it only when WXDEBUG environment variable is set
+ if ( wxGetEnv(wxT("WXDEBUG"), NULL) )
+ freopen("output.err", "wt", stderr);
#endif
+ wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui);
+ if ( oldLog ) delete oldLog;
+
return TRUE;
}
// 'Garbage' collection of windows deleted with Close().
DeletePendingObjects();
+#if wxUSE_LOG
+ // flush the logged messages if any
+ wxLog::FlushActive();
+#endif // wxUSE_LOG
+
// Send OnIdle events to all windows
if ( SendIdleEvents() )
event.RequestMore(TRUE);
void wxApp::CleanUp()
{
- delete gs_rootWindow;
-
#if wxUSE_LOG
- // flush the logged messages if any
- wxLog *log = wxLog::GetActiveTarget();
- if (log != NULL && log->HasPendingMessages())
- log->Flush();
-
// continuing to use user defined log target is unsafe from now on because
// some resources may be already unavailable, so replace it by something
// more safe
delete oldlog;
#endif // wxUSE_LOG
+ delete gs_rootWindow;
+
wxModule::CleanUpModules();
#if wxUSE_WX_RESOURCES
}
}
+#if wxUSE_LOG
+ // flush the logged messages if any
+ wxLog *log = wxLog::GetActiveTarget();
+ if (log != NULL && log->HasPendingMessages())
+ log->Flush();
+#endif // wxUSE_LOG
retValue = wxTheApp->OnExit();
}
}