Use wxCmdLineArgsArray::Init() instead of assignment operator in Unicode
build.
This was broken by 70a499f635
.
159 lines
3.8 KiB
C++
159 lines
3.8 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"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#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()
|
|
{
|
|
}
|
|
|
|
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.
|
|
#if wxUSE_UNICODE
|
|
// 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] = NULL;
|
|
|
|
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;
|
|
|
|
#else // ANSI
|
|
|
|
if ( !wxDfbCheckReturn(DirectFBInit(&argc, &argv)) )
|
|
return false;
|
|
|
|
#endif // Unicode/ANSI
|
|
|
|
// update internal arg[cv] as DFB may have removed processed options:
|
|
this->argc = argc;
|
|
#if wxUSE_UNICODE
|
|
this->argv.Init(argc, argv);
|
|
#else
|
|
this->argv = argv;
|
|
#endif
|
|
|
|
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();
|
|
}
|