Files
wxWidgets/src/dfb/app.cpp
T
Vadim Zeitlin 2be5f429c1 Don't create wrong wxAppTraits during wxApp construction
Creating wxAppTraits before the object of the user-defined class
deriving from wxApp is fully constructed may result in creating a wrong
traits object if the user class overrides CreateTraits() because the
correct, i.e. user-defined, version isn't used if it's called from wx
code.

This had already happened before and was worked around back in
bc334f39ec (Fixes Bug [ 930200 ] Async does not work, 2004-04-27), but
recently happened again after the changes of 94e4818caa (Warn on startup
when not using comctl32.dll v6 in wxMSW, 2022-11-28). To prevent it from
happening in the future, add WXAppConstructed() that must be called
after fully constructing wxApp (and forgetting to do it would result in
an assert, so doesn't risk to go unnoticed) and which resets m_traits if
it has been wrongly created.

It would, perhaps, be even better if we avoided creating the wrong
traits in the first place, but for now this at least fixes the latest
problem and ensures it doesn't reoccur.

Closes #23315.
2023-03-06 21:28:58 +00:00

145 lines
3.6 KiB
C++

/////////////////////////////////////////////////////////////////////////////
// Name: src/dfb/app.cpp
// Purpose: wxApp implementation
// Author: Vaclav Slavik
// Created: 2006-08-16
// Copyright: (c) 2006 REA Elektronik GmbH
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/app.h"
#include "wx/evtloop.h"
#include "wx/thread.h"
#include "wx/dfb/private.h"
#include "wx/private/fontmgr.h"
//-----------------------------------------------------------------------------
// wxApp initialization
//-----------------------------------------------------------------------------
wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler);
wxApp::wxApp()
{
WXAppConstructed();
}
wxApp::~wxApp()
{
}
bool wxApp::Initialize(int& argc, wxChar **argv)
{
if ( !wxAppBase::Initialize(argc, argv) )
return false;
// FIXME-UTF8: This code is taken from wxGTK and duplicated here. This
// is just a temporary fix to make wxDFB compile in Unicode
// build, the real fix is to change Initialize()'s signature
// to use char* on Unix.
// DirectFBInit() wants UTF-8, not wchar_t, so convert
int i;
char **argvDFB = new char *[argc + 1];
for ( i = 0; i < argc; i++ )
{
argvDFB[i] = strdup(wxConvUTF8.cWX2MB(argv[i]));
}
argvDFB[argc] = nullptr;
int argcDFB = argc;
if ( !wxDfbCheckReturn(DirectFBInit(&argcDFB, &argvDFB)) )
return false;
if ( argcDFB != argc )
{
// we have to drop the parameters which were consumed by DFB+
for ( i = 0; i < argcDFB; i++ )
{
while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvDFB[i]) != 0 )
{
memmove(argv + i, argv + i + 1, (argc - i)*sizeof(*argv));
}
}
argc = argcDFB;
}
//else: DirectFBInit() didn't modify our parameters
// free our copy
for ( i = 0; i < argcDFB; i++ )
{
free(argvDFB[i]);
}
delete [] argvDFB;
// update internal arg[cv] as DFB may have removed processed options:
this->argc = argc;
this->argv.Init(argc, argv);
if ( !wxIDirectFB::Get() )
return false;
return true;
}
void wxApp::CleanUp()
{
wxAppBase::CleanUp();
wxFontsManager::CleanUp();
wxEventLoop::CleanUp();
wxIDirectFB::CleanUp();
}
//-----------------------------------------------------------------------------
// display mode
//-----------------------------------------------------------------------------
static wxVideoMode GetCurrentVideoMode()
{
wxIDirectFBDisplayLayerPtr layer(wxIDirectFB::Get()->GetDisplayLayer());
if ( !layer )
return wxVideoMode(); // invalid
return layer->GetVideoMode();
}
wxVideoMode wxApp::GetDisplayMode() const
{
if ( !m_videoMode.IsOk() )
wxConstCast(this, wxApp)->m_videoMode = GetCurrentVideoMode();
return m_videoMode;
}
bool wxApp::SetDisplayMode(const wxVideoMode& mode)
{
if ( !wxIDirectFB::Get()->SetVideoMode(mode.w, mode.h, mode.bpp) )
return false;
m_videoMode = mode;
return true;
}
//-----------------------------------------------------------------------------
// events processing related
//-----------------------------------------------------------------------------
void wxApp::WakeUpIdle()
{
// we don't need a mutex here, since we use the wxConsoleEventLoop
// and wxConsoleEventLoop::WakeUp() is thread-safe
wxEventLoopBase * const loop = wxEventLoop::GetActive();
if ( loop )
loop->WakeUp();
}