#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
//-----------------------------------------------------------------------------
m_wnd = NULL;
}
- virtual bool AcceptsFocus() { return FALSE; }
+ virtual bool AcceptsFocus() const { return FALSE; }
+
+ DECLARE_DYNAMIC_CLASS(wxRootWindow)
};
+IMPLEMENT_DYNAMIC_CLASS(wxRootWindow, wxWindow)
+
static wxRootWindow *gs_rootWindow = NULL;
//-----------------------------------------------------------------------------
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(displayMode.GetScreenSize().x,
- displayMode.GetScreenSize().y,
+ mode = MGL_findMode(displayMode.GetWidth(),
+ displayMode.GetHeight(),
displayMode.GetDepth());
if ( mode == -1 )
{
- wxLogWarning(_("Mode %ix%i-%i not available, falling back to default mode."),
- displayMode.GetScreenSize().x,
- displayMode.GetScreenSize().y,
+ wxLogError(_("Mode %ix%i-%i not available."),
+ displayMode.GetWidth(),
+ displayMode.GetHeight(),
displayMode.GetDepth());
- mode = 0; // always available
+ 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;
}
wxApp::wxApp() : m_mainLoop(NULL)
{
- m_displayMode = wxDisplayModeInfo(wxSize(640, 480), 16);
}
wxApp::~wxApp()
{
}
+wxDisplayModeInfo wxGetDefaultDisplayMode()
+{
+ wxString mode;
+ unsigned w, h, bpp;
+
+ if ( !wxGetEnv(wxT("WXMODE"), &mode) ||
+ (wxSscanf(mode.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3) )
+ {
+ w = 640, h = 480, bpp = 16;
+ }
+
+ return wxDisplayModeInfo(w, h, bpp);
+}
+
bool wxApp::SetDisplayMode(const wxDisplayModeInfo& mode)
{
if ( !mode.IsOk() )
if ( g_displayDC != NULL )
{
// FIXME_MGL -- we currently don't allow to switch video mode
- // at runtime. This can hopefully be changed...
+ // more than once. This can hopefully be changed...
wxFAIL_MSG(wxT("Can't change display mode after intialization!"));
return FALSE;
}
+
+ if ( !wxCreateMGL_WM(mode) )
+ return FALSE;
+ gs_rootWindow = new wxRootWindow;
+
m_displayMode = mode;
+
return TRUE;
}
bool wxApp::OnInitGui()
{
- if ( !wxCreateMGL_WM(m_displayMode) )
- return FALSE;
-
- // This has to be done *after* wxCreateMGL_WM() because it initializes
- // wxUniv's themes
if ( !wxAppBase::OnInitGui() )
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));
+#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
+ wxString redirect;
+ if ( wxGetEnv(wxT("WXSTDERR"), &redirect) )
+ freopen(redirect.mb_str(), "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);
wxClassInfo::InitializeClasses();
- wxSystemSettings::Init();
-
#if wxUSE_INTL
wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
#endif
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
wxDeleteStockObjects();
wxDeleteStockLists();
- // Can't do this in wxModule, because fonts are needed by stock lists
- delete wxTheFontsManager;
- wxTheFontsManager = (wxFontsManager*) NULL;
-
delete wxTheApp;
wxTheApp = (wxApp*) NULL;
+
// GL: I'm annoyed ... I don't know where to put this and I don't want to
// create a module for that as it's part of the core.
#if wxUSE_THREADS
delete wxPendingEventsLocker;
#endif
- wxSystemSettings::Done();
+ wxClassInfo::CleanUpClasses();
- delete[] wxBuffer;
+ // Can't do this in wxModule, because fonts are needed by stock lists
+ // (do it after deleting wxTheApp and cleaning modules up, since somebody
+ // may be deleting fonts that lately)
+ delete wxTheFontsManager;
+ wxTheFontsManager = (wxFontsManager*) NULL;
- wxClassInfo::CleanUpClasses();
+ delete[] wxBuffer;
// check for memory leaks
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
int wxEntry(int argc, char *argv[])
{
+#ifdef __DJGPP__
+ // VS: disable long filenames under DJGPP as the very first thing,
+ // since SciTech MGL doesn't like them much...
+ wxSetEnv(wxT("LFN"), wxT("N"));
+#endif
+
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
// This seems to be necessary since there are 'rogue'
// objects present at this point (perhaps global objects?)
}
}
+#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();
}
}
projects / wxWidgets.git / blobdiff