/////////////////////////////////////////////////////////////////////////////
// Name: src/common/appcmn.cpp
-// Purpose: wxAppConsole and wxAppBase methods common to all platforms
+// Purpose: wxAppBase methods common to all platforms
// Author: Vadim Zeitlin
// Modified by:
// Created: 18.10.99
-// RCS-ID: $Id$
// Copyright: (c) Vadim Zeitlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/apptrait.h"
#include "wx/cmdline.h"
-#include "wx/evtloop.h"
#include "wx/msgout.h"
#include "wx/thread.h"
#include "wx/vidmode.h"
-#include "wx/ptr_scpd.h"
-
-#ifdef __WXDEBUG__
- #if wxUSE_STACKWALKER
- #include "wx/stackwalk.h"
- #endif // wxUSE_STACKWALKER
-#endif // __WXDEBUG__
-
-#if defined(__WXMSW__)
- #include "wx/msw/private.h" // includes windows.h for LOGFONT
-#endif
+#include "wx/evtloop.h"
#if wxUSE_FONTMAP
#include "wx/fontmap.h"
#include "wx/build.h"
WX_CHECK_BUILD_OPTIONS("wxCore")
-WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
-
-// ----------------------------------------------------------------------------
-// wxEventLoopPtr
-// ----------------------------------------------------------------------------
-
-// this defines wxEventLoopPtr
-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop)
-
// ============================================================================
// wxAppBase implementation
// ============================================================================
wxAppBase::wxAppBase()
{
- m_topWindow = (wxWindow *)NULL;
-
+ m_topWindow = NULL;
+
m_useBestVisual = false;
m_forceTrueColour = false;
-
- m_isActive = true;
- m_mainLoop = NULL;
+ m_isActive = true;
// We don't want to exit the app if the user code shows a dialog from its
// OnInit() -- but this is what would happen if we set m_exitOnFrameDelete
bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)
{
+#ifdef __WXOSX__
+ // Mac OS X passes a process serial number command line argument when
+ // the application is launched from the Finder. This argument must be
+ // removed from the command line arguments before being handled by the
+ // application (otherwise applications would need to handle it)
+ //
+ // Notice that this has to be done for all ports that can be used under OS
+ // X (e.g. wxGTK) and not just wxOSX itself, hence this code is here and
+ // not in a port-specific file.
+ if ( argcOrig > 1 )
+ {
+ static const wxChar *ARG_PSN = wxT("-psn_");
+ if ( wxStrncmp(argvOrig[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )
+ {
+ // remove this argument
+ --argcOrig;
+ memmove(argvOrig + 1, argvOrig + 2, argcOrig * sizeof(wxChar*));
+ }
+ }
+#endif // __WXOSX__
+
if ( !wxAppConsole::Initialize(argcOrig, argvOrig) )
return false;
-#if wxUSE_THREADS
- wxPendingEventsLocker = new wxCriticalSection;
-#endif
-
wxInitializeStockLists();
wxBitmap::InitStandardHandlers();
+ // for compatibility call the old initialization function too
+ if ( !OnInitGui() )
+ return false;
+
return true;
}
wxDeleteStockLists();
- delete wxTheColourDatabase;
- wxTheColourDatabase = NULL;
+ wxDELETE(wxTheColourDatabase);
- delete wxPendingEvents;
- wxPendingEvents = NULL;
-
-#if wxUSE_THREADS
- delete wxPendingEventsLocker;
- wxPendingEventsLocker = NULL;
-
- #if wxUSE_VALIDATORS
- // If we don't do the following, we get an apparent memory leak.
- ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
- #endif // wxUSE_VALIDATORS
-#endif // wxUSE_THREADS
+ wxAppConsole::CleanUp();
}
// ----------------------------------------------------------------------------
// GUI-specific command line options handling
// ----------------------------------------------------------------------------
-#define OPTION_THEME _T("theme")
-#define OPTION_MODE _T("mode")
+#define OPTION_THEME "theme"
+#define OPTION_MODE "mode"
void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
{
#ifdef __WXUNIVERSAL__
{
wxCMD_LINE_OPTION,
- wxEmptyString,
+ NULL,
OPTION_THEME,
gettext_noop("specify the theme to use"),
wxCMD_LINE_VAL_STRING,
},
#endif // __WXUNIVERSAL__
-#if defined(__WXMGL__)
- // VS: this is not specific to wxMGL, all fullscreen (framebuffer) ports
+#if defined(__WXDFB__)
+ // VS: this is not specific to wxDFB, all fullscreen (framebuffer) ports
// should provide this option. That's why it is in common/appcmn.cpp
- // and not mgl/app.cpp
+ // and not dfb/app.cpp
{
wxCMD_LINE_OPTION,
- wxEmptyString,
+ NULL,
OPTION_MODE,
gettext_noop("specify display mode to use (e.g. 640x480-16)"),
wxCMD_LINE_VAL_STRING,
0x0
},
-#endif // __WXMGL__
+#endif // __WXDFB__
// terminator
- {
- wxCMD_LINE_NONE,
- wxEmptyString,
- wxEmptyString,
- wxEmptyString,
- wxCMD_LINE_VAL_NONE,
- 0x0
- }
+ wxCMD_LINE_DESC_END
};
parser.SetDesc(cmdLineGUIDesc);
}
#endif // __WXUNIVERSAL__
-#if defined(__WXMGL__)
+#if defined(__WXDFB__)
wxString modeDesc;
if ( parser.Found(OPTION_MODE, &modeDesc) )
{
unsigned w, h, bpp;
- if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
+ if ( wxSscanf(modeDesc.c_str(), wxT("%ux%u-%u"), &w, &h, &bpp) != 3 )
{
wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
return false;
if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
return false;
}
-#endif // __WXMGL__
+#endif // __WXDFB__
return wxAppConsole::OnCmdLineParsed(parser);
}
#endif // wxUSE_CMDLINE_PARSER
-// ----------------------------------------------------------------------------
-// main event loop implementation
-// ----------------------------------------------------------------------------
-
-int wxAppBase::MainLoop()
-{
- wxEventLoopTiedPtr mainLoop(&m_mainLoop, new wxEventLoop);
-
- return m_mainLoop->Run();
-}
-
-void wxAppBase::ExitMainLoop()
-{
- // we should exit from the main event loop, not just any currently active
- // (e.g. modal dialog) event loop
- if ( m_mainLoop && m_mainLoop->IsRunning() )
- {
- m_mainLoop->Exit(0);
- }
-}
-
-bool wxAppBase::Pending()
-{
- // use the currently active message loop here, not m_mainLoop, because if
- // we're showing a modal dialog (with its own event loop) currently the
- // main event loop is not running anyhow
- wxEventLoop * const loop = wxEventLoop::GetActive();
-
- return loop && loop->Pending();
-}
-
-bool wxAppBase::Dispatch()
-{
- // see comment in Pending()
- wxEventLoop * const loop = wxEventLoop::GetActive();
-
- return loop && loop->Dispatch();
-}
-
// ----------------------------------------------------------------------------
// OnXXX() hooks
// ----------------------------------------------------------------------------
}
//else: it has been changed, assume the user knows what he is doing
- return MainLoop();
+ return wxAppConsole::OnRun();
}
int wxAppBase::OnExit()
return wxAppConsole::OnExit();
}
-void wxAppBase::Exit()
-{
- ExitMainLoop();
-}
-
wxAppTraits *wxAppBase::CreateTraits()
{
return new wxGUIAppTraits;
(void)ProcessEvent(event);
}
-// ----------------------------------------------------------------------------
-// idle handling
-// ----------------------------------------------------------------------------
-
-void wxAppBase::DeletePendingObjects()
+bool wxAppBase::SafeYield(wxWindow *win, bool onlyIfNeeded)
{
- wxList::compatibility_iterator node = wxPendingDelete.GetFirst();
- while (node)
- {
- wxObject *obj = node->GetData();
+ wxWindowDisabler wd(win);
- // remove it from the list first so that if we get back here somehow
- // during the object deletion (e.g. wxYield called from its dtor) we
- // wouldn't try to delete it the second time
- if ( wxPendingDelete.Member(obj) )
- wxPendingDelete.Erase(node);
+ wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
- delete obj;
+ return loop && loop->Yield(onlyIfNeeded);
+}
- // Deleting one object may have deleted other pending
- // objects, so start from beginning of list again.
- node = wxPendingDelete.GetFirst();
- }
+bool wxAppBase::SafeYieldFor(wxWindow *win, long eventsToProcess)
+{
+ wxWindowDisabler wd(win);
+
+ wxEventLoopBase * const loop = wxEventLoopBase::GetActive();
+
+ return loop && loop->YieldFor(eventsToProcess);
}
+
+// ----------------------------------------------------------------------------
+// idle handling
+// ----------------------------------------------------------------------------
+
// Returns true if more time is needed.
bool wxAppBase::ProcessIdle()
{
+ // call the base class version first to send the idle event to wxTheApp
+ // itself
+ bool needMore = wxAppConsoleBase::ProcessIdle();
wxIdleEvent event;
- bool needMore = false;
wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
while (node)
{
wxWindow* win = node->GetData();
- if (SendIdleEvents(win, event))
+
+ // Don't send idle events to the windows that are about to be destroyed
+ // anyhow, this is wasteful and unexpected.
+ if ( !wxPendingDelete.Member(win) && win->SendIdleEvents(event) )
needMore = true;
node = node->GetNext();
}
- event.SetEventObject(this);
- (void) ProcessEvent(event);
- if (event.MoreRequested())
- needMore = true;
-
wxUpdateUIEvent::ResetUpdateTime();
return needMore;
}
-// Send idle event to window and all subwindows
-bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
-{
- bool needMore = false;
-
- win->OnInternalIdle();
-
- if (wxIdleEvent::CanSend(win))
- {
- event.SetEventObject(win);
- win->GetEventHandler()->ProcessEvent(event);
-
- if (event.MoreRequested())
- needMore = true;
- }
- wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
- while ( node )
- {
- wxWindow *child = node->GetData();
- if (SendIdleEvents(child, event))
- needMore = true;
-
- node = node->GetNext();
- }
-
- return needMore;
-}
-
-void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
-{
- // If there are pending events, we must process them: pending events
- // are either events to the threads other than main or events posted
- // with wxPostEvent() functions
- // GRG: I have moved this here so that all pending events are processed
- // before starting to delete any objects. This behaves better (in
- // particular, wrt wxPostEvent) and is coherent with wxGTK's current
- // behaviour. Changed Feb/2000 before 2.1.14
- ProcessPendingEvents();
-
- // 'Garbage' collection of windows deleted with Close().
- DeletePendingObjects();
-
-#if wxUSE_LOG
- // flush the logged messages if any
- wxLog::FlushActive();
-#endif // wxUSE_LOG
-
-}
-
-// ----------------------------------------------------------------------------
-// exceptions support
-// ----------------------------------------------------------------------------
-
-#if wxUSE_EXCEPTIONS
-
-bool wxAppBase::OnExceptionInMainLoop()
-{
- throw;
-
- // some compilers are too stupid to know that we never return after throw
-#if defined(__DMC__) || (defined(_MSC_VER) && _MSC_VER < 1200)
- return false;
-#endif
-}
-
-#endif // wxUSE_EXCEPTIONS
-
// ----------------------------------------------------------------------------
// wxGUIAppTraitsBase
// ----------------------------------------------------------------------------
wxLog *wxGUIAppTraitsBase::CreateLogTarget()
{
#if wxUSE_LOGGUI
+#ifndef __WXOSX_IPHONE__
return new wxLogGui;
+#else
+ return new wxLogStderr;
+#endif
#else
// we must have something!
return new wxLogStderr;
// is (according to common practice):
// - console apps: to stderr (on any platform)
// - GUI apps: stderr on Unix platforms (!)
- // message box under Windows and others
+ // stderr if available and message box otherwise on others
+ // (currently stderr only Windows if app running from console)
#ifdef __UNIX__
return new wxMessageOutputStderr;
#else // !__UNIX__
// wxMessageOutputMessageBox doesn't work under Motif
#ifdef __WXMOTIF__
return new wxMessageOutputLog;
+ #elif wxUSE_MSGDLG
+ return new wxMessageOutputBest(wxMSGOUT_PREFER_STDERR);
#else
- return new wxMessageOutputMessageBox;
+ return new wxMessageOutputStderr;
#endif
#endif // __UNIX__/!__UNIX__
}
return NULL;
}
-#ifdef __WXDEBUG__
-
bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
{
-#if defined(__WXMSW__) || !wxUSE_MSGDLG
+#if wxDEBUG_LEVEL
// under MSW we prefer to use the base class version using ::MessageBox()
// even if wxMessageBox() is available because it has less chances to
// double fault our app than our wxMessageBox()
- return wxAppTraitsBase::ShowAssertDialog(msg);
-#else // wxUSE_MSGDLG
- wxString msgDlg = msg;
+ //
+ // under DFB the message dialog is not always functional right now
+ //
+ // and finally we can't use wxMessageBox() if it wasn't compiled in, of
+ // course
+#if !defined(__WXMSW__) && !defined(__WXDFB__) && wxUSE_MSGDLG
+
+ // we can't (safely) show the GUI dialog from another thread, only do it
+ // for the asserts in the main thread
+ if ( wxIsMainThread() )
+ {
+ wxString msgDlg = msg;
#if wxUSE_STACKWALKER
- // on Unix stack frame generation may take some time, depending on the
- // size of the executable mainly... warn the user that we are working
- wxFprintf(stderr, wxT("[Debug] Generating a stack trace... please wait"));
- fflush(stderr);
-
- const wxString stackTrace = GetAssertStackTrace();
- if ( !stackTrace.empty() )
- msgDlg << _T("\n\nCall stack:\n") << stackTrace;
+ const wxString stackTrace = GetAssertStackTrace();
+ if ( !stackTrace.empty() )
+ msgDlg << wxT("\n\nCall stack:\n") << stackTrace;
#endif // wxUSE_STACKWALKER
- // this message is intentionally not translated -- it is for
- // developpers only
- msgDlg += wxT("\nDo you want to stop the program?\n")
- wxT("You can also choose [Cancel] to suppress ")
- wxT("further warnings.");
+ // this message is intentionally not translated -- it is for
+ // developpers only
+ msgDlg += wxT("\nDo you want to stop the program?\n")
+ wxT("You can also choose [Cancel] to suppress ")
+ wxT("further warnings.");
- switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),
- wxYES_NO | wxCANCEL | wxICON_STOP ) )
- {
- case wxYES:
- wxTrap();
- break;
+ switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),
+ wxYES_NO | wxCANCEL | wxICON_STOP ) )
+ {
+ case wxYES:
+ wxTrap();
+ break;
+
+ case wxCANCEL:
+ // no more asserts
+ return true;
- case wxCANCEL:
- // no more asserts
- return true;
+ //case wxNO: nothing to do
+ }
- //case wxNO: nothing to do
+ return false;
}
+#endif // wxUSE_MSGDLG
+#endif // wxDEBUG_LEVEL
- return false;
-#endif // !wxUSE_MSGDLG/wxUSE_MSGDLG
+ return wxAppTraitsBase::ShowAssertDialog(msg);
}
-#endif // __WXDEBUG__
-
bool wxGUIAppTraitsBase::HasStderr()
{
// we consider that under Unix stderr always goes somewhere, even if the
#endif
}
-void wxGUIAppTraitsBase::ScheduleForDestroy(wxObject *object)
-{
- if ( !wxPendingDelete.Member(object) )
- wxPendingDelete.Append(object);
-}
-
-void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
-{
- wxPendingDelete.DeleteObject(object);
-}
-
-#if wxUSE_SOCKETS
-
-#if defined(__WINDOWS__)
- #include "wx/msw/gsockmsw.h"
-#elif defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
- #include "wx/unix/gsockunx.h"
-#elif defined(__WXMAC__)
- #include <MacHeaders.c>
- #define OTUNIXERRORS 1
- #include <OpenTransport.h>
- #include <OpenTransportProviders.h>
- #include <OpenTptInternet.h>
-
- #include "wx/mac/gsockmac.h"
-#else
- #error "Must include correct GSocket header here"
-#endif
-
-GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
-{
-#if defined(__WXMAC__) && !defined(__DARWIN__)
- // NB: wxMac CFM does not have any GUI-specific functions in gsocket.c and
- // so it doesn't need this table at all
- return NULL;
-#else // !__WXMAC__ || __DARWIN__
- static GSocketGUIFunctionsTableConcrete table;
- return &table;
-#endif // !__WXMAC__ || __DARWIN__
-}
-
-#endif
projects / wxWidgets.git / blobdiff