extended display mode handling to accept WXMODE env. variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -220,6 +220,20 @@ 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() )
|
||||
|
@@ -469,12 +469,14 @@ END_EVENT_TABLE()
|
||||
// constructors and such
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
extern wxDisplayModeInfo wxGetDefaultDisplayMode();
|
||||
|
||||
void wxWindowMGL::Init()
|
||||
{
|
||||
// First of all, make sure window manager is up and running. If it is
|
||||
// not the case, initialize it in default display mode
|
||||
if ( !g_winMng )
|
||||
wxTheApp->SetDisplayMode(wxDisplayModeInfo(640, 480, 16));
|
||||
wxTheApp->SetDisplayMode(wxGetDefaultDisplayMode());
|
||||
|
||||
// generic:
|
||||
InitBase();
|
||||
|
Reference in New Issue
Block a user