/////////////////////////////////////////////////////////////////////////////
-// Name: common/appcmn.cpp
+// Name: src/common/appcmn.cpp
// Purpose: wxAppConsole and wxAppBase methods common to all platforms
// Author: Vadim Zeitlin
// Modified by:
// headers
// ---------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "appbase.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
+ #include "wx/window.h"
#include "wx/bitmap.h"
- #include "wx/intl.h"
- #include "wx/list.h"
#include "wx/log.h"
#include "wx/msgdlg.h"
- #include "wx/bitmap.h"
#include "wx/confbase.h"
+ #include "wx/utils.h"
+ #include "wx/wxcrtvararg.h"
#endif
#include "wx/apptrait.h"
#include "wx/cmdline.h"
-#include "wx/evtloop.h"
#include "wx/msgout.h"
#include "wx/thread.h"
-#include "wx/utils.h"
-#include "wx/ptr_scpd.h"
+#include "wx/vidmode.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
#include "wx/build.h"
WX_CHECK_BUILD_OPTIONS("wxCore")
-
-// ----------------------------------------------------------------------------
-// wxEventLoopPtr
-// ----------------------------------------------------------------------------
-
-// this defines wxEventLoopPtr
-wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop);
+WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
// ============================================================================
// wxAppBase implementation
wxAppBase::wxAppBase()
{
m_topWindow = (wxWindow *)NULL;
+
m_useBestVisual = false;
- m_isActive = true;
+ m_forceTrueColour = false;
-#if wxUSE_EVTLOOP_IN_APP
- m_mainLoop = NULL;
-#endif // wxUSE_EVTLOOP_IN_APP
+ 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
m_exitOnFrameDelete = Later;
}
-bool wxAppBase::Initialize(int& argc, wxChar **argv)
+bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)
{
- if ( !wxAppConsole::Initialize(argc, argv) )
+ if ( !wxAppConsole::Initialize(argcOrig, argvOrig) )
return false;
-#if wxUSE_THREADS
- wxPendingEventsLocker = new wxCriticalSection;
-#endif
-
wxInitializeStockLists();
- wxInitializeStockObjects();
wxBitmap::InitStandardHandlers();
// undo everything we did in Initialize() above
wxBitmap::CleanUpHandlers();
- wxDeleteStockObjects();
+ wxStockGDI::DeleteAll();
wxDeleteStockLists();
delete wxTheColourDatabase;
wxTheColourDatabase = NULL;
- 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();
+}
+
+// ----------------------------------------------------------------------------
+// various accessors
+// ----------------------------------------------------------------------------
+
+wxWindow* wxAppBase::GetTopWindow() const
+{
+ wxWindow* window = m_topWindow;
+ if (window == NULL && wxTopLevelWindows.GetCount() > 0)
+ window = wxTopLevelWindows.GetFirst()->GetData();
+ return window;
+}
+
+wxVideoMode wxAppBase::GetDisplayMode() const
+{
+ return wxVideoMode();
+}
+
+wxLayoutDirection wxAppBase::GetLayoutDirection() const
+{
+#if wxUSE_INTL
+ const wxLocale *const locale = wxGetLocale();
+ if ( locale )
+ {
+ const wxLanguageInfo *const
+ info = wxLocale::GetLanguageInfo(locale->GetLanguage());
+
+ if ( info )
+ return info->LayoutDirection;
+ }
+#endif // wxUSE_INTL
+
+ // we don't know
+ return wxLayout_Default;
}
#if wxUSE_CMDLINE_PARSER
#ifdef __WXUNIVERSAL__
{
wxCMD_LINE_OPTION,
- _T(""),
+ wxEmptyString,
OPTION_THEME,
gettext_noop("specify the theme to use"),
wxCMD_LINE_VAL_STRING,
// and not mgl/app.cpp
{
wxCMD_LINE_OPTION,
- _T(""),
+ wxEmptyString,
OPTION_MODE,
gettext_noop("specify display mode to use (e.g. 640x480-16)"),
wxCMD_LINE_VAL_STRING,
// terminator
{
wxCMD_LINE_NONE,
- _T(""),
- _T(""),
- _T(""),
+ wxEmptyString,
+ wxEmptyString,
+ wxEmptyString,
wxCMD_LINE_VAL_NONE,
0x0
}
#endif // wxUSE_CMDLINE_PARSER
-// ----------------------------------------------------------------------------
-// main event loop implementation
-// ----------------------------------------------------------------------------
-
-int wxAppBase::MainLoop()
-{
-#if wxUSE_EVTLOOP_IN_APP
- wxEventLoopTiedPtr mainLoop(&m_mainLoop, new wxEventLoop);
-
- return m_mainLoop->Run();
-#else // !wxUSE_EVTLOOP_IN_APP
- return 0;
-#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP
-}
-
-void wxAppBase::ExitMainLoop()
-{
-#if wxUSE_EVTLOOP_IN_APP
- // 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);
- }
-#endif // wxUSE_EVTLOOP_IN_APP
-}
-
-bool wxAppBase::Pending()
-{
-#if wxUSE_EVTLOOP_IN_APP
- // 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();
-#else // wxUSE_EVTLOOP_IN_APP
- return false;
-#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP
-}
-
-bool wxAppBase::Dispatch()
-{
-#if wxUSE_EVTLOOP_IN_APP
- // see comment in Pending()
- wxEventLoop * const loop = wxEventLoop::GetActive();
-
- return loop && loop->Dispatch();
-#else // wxUSE_EVTLOOP_IN_APP
- return true;
-#endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP
-}
-
// ----------------------------------------------------------------------------
// 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()
{
wxList::compatibility_iterator node = wxPendingDelete.GetFirst();
{
wxObject *obj = node->GetData();
- delete obj;
-
- if (wxPendingDelete.Member(obj))
+ // 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);
+ delete obj;
+
// Deleting one object may have deleted other pending
// objects, so start from beginning of list again.
node = wxPendingDelete.GetFirst();
// Returns true if more time is needed.
bool wxAppBase::ProcessIdle()
{
+ // process pending wx events before sending idle events
+ ProcessPendingEvents();
+
wxIdleEvent event;
bool needMore = false;
wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
node = node->GetNext();
}
- event.SetEventObject(this);
- (void) ProcessEvent(event);
- if (event.MoreRequested())
+ if (wxAppConsole::ProcessIdle())
needMore = true;
+ // 'Garbage' collection of windows deleted with Close().
+ DeletePendingObjects();
+
+#if wxUSE_LOG
+ // flush the logged messages if any
+ wxLog::FlushActive();
+#endif
+
wxUpdateUIEvent::ResetUpdateTime();
return needMore;
win->OnInternalIdle();
- if (wxIdleEvent::CanSend(win))
+ // should we send idle event to this window?
+ if ( wxIdleEvent::GetMode() == wxIDLE_PROCESS_ALL ||
+ win->HasExtraStyle(wxWS_EX_PROCESS_IDLE) )
{
event.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(event);
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
-
-}
-
// ----------------------------------------------------------------------------
// wxGUIAppTraitsBase
// ----------------------------------------------------------------------------
wxLog *wxGUIAppTraitsBase::CreateLogTarget()
{
-#if wxUSE_LOGGUI
+// DE: One day I'll remove this but right now the generic dialog used for this
+// just doesn't work right at all on wxCocoa.
+#if wxUSE_LOGGUI && !defined(__WXCOCOA__)
return new wxLogGui;
#else
- // wem ust have something!
+ // we must have something!
return new wxLogStderr;
#endif
}
// wxMessageOutputMessageBox doesn't work under Motif
#ifdef __WXMOTIF__
return new wxMessageOutputLog;
- #else
+ #elif wxUSE_MSGDLG
return new wxMessageOutputMessageBox;
+ #else
+ return new wxMessageOutputStderr;
#endif
#endif // __UNIX__/!__UNIX__
}
bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
{
+#if defined(__WXMSW__) || !wxUSE_MSGDLG
// 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()
-#if defined(__WXMSW__) || !wxUSE_MSGDLG
return wxAppTraitsBase::ShowAssertDialog(msg);
#else // wxUSE_MSGDLG
+ 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;
+#endif // wxUSE_STACKWALKER
+
// this message is intentionally not translated -- it is for
// developpers only
- wxString msgDlg(msg);
msgDlg += wxT("\nDo you want to stop the program?\n")
wxT("You can also choose [Cancel] to suppress ")
wxT("further warnings.");
#if wxUSE_SOCKETS
-#if defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
- #include "wx/unix/gsockunx.h"
-#elif defined(__WINDOWS__)
+#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 <MacHeaders.c>
+ #define OTUNIXERRORS 1
+ #include <OpenTransport.h>
+ #include <OpenTransportProviders.h>
+ #include <OpenTptInternet.h>
- #include "wx/mac/gsockmac.h"
+ #include "wx/mac/gsockmac.h"
#else
#error "Must include correct GSocket header here"
#endif
}
#endif
-
projects / wxWidgets.git / blobdiff