/////////////////////////////////////////////////////////////////////////////
// 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
#include "wx/msgout.h"
#include "wx/thread.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
-#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;
-
// ============================================================================
// wxAppBase implementation
// ============================================================================
wxAppBase::wxAppBase()
{
- m_topWindow = (wxWindow *)NULL;
+ m_topWindow = NULL;
m_useBestVisual = false;
m_forceTrueColour = false;
wxBitmap::InitStandardHandlers();
+ // for compatibility call the old initialization function too
+ if ( !OnInitGui() )
+ return false;
+
return true;
}
delete wxTheColourDatabase;
wxTheColourDatabase = NULL;
-#if wxUSE_THREADS
- #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,
// and not mgl/app.cpp
{
wxCMD_LINE_OPTION,
- wxEmptyString,
+ NULL,
OPTION_MODE,
gettext_noop("specify display mode to use (e.g. 640x480-16)"),
wxCMD_LINE_VAL_STRING,
#endif // __WXMGL__
// terminator
- {
- wxCMD_LINE_NONE,
- wxEmptyString,
- wxEmptyString,
- wxEmptyString,
- wxCMD_LINE_VAL_NONE,
- 0x0
- }
+ wxCMD_LINE_DESC_END
};
parser.SetDesc(cmdLineGUIDesc);
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;
(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)
{
node = node->GetNext();
}
- needMore = wxAppConsole::ProcessIdle();
+#if wxUSE_LOG
+ // flush the logged messages if any
+ wxLog::FlushActive();
+#endif
wxUpdateUIEvent::ResetUpdateTime();
win->HasExtraStyle(wxWS_EX_PROCESS_IDLE) )
{
event.SetEventObject(win);
- win->GetEventHandler()->ProcessEvent(event);
+ win->HandleWindowEvent(event);
if (event.MoreRequested())
needMore = true;
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
// ----------------------------------------------------------------------------
// 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
// 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()
+ //
+ // 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
return wxAppTraitsBase::ShowAssertDialog(msg);
#else // wxUSE_MSGDLG
+#if wxDEBUG_LEVEL
wxString msgDlg = msg;
#if wxUSE_STACKWALKER
const wxString stackTrace = GetAssertStackTrace();
if ( !stackTrace.empty() )
- msgDlg << _T("\n\nCall stack:\n") << stackTrace;
+ msgDlg << wxT("\n\nCall stack:\n") << stackTrace;
#endif // wxUSE_STACKWALKER
// this message is intentionally not translated -- it is for
//case wxNO: nothing to do
}
+#else // !wxDEBUG_LEVEL
+ // this function always exists (for ABI compatibility) but is never called
+ // if debug level is 0 and so can simply do nothing then
+ wxUnusedVar(msg);
+#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL
return false;
#endif // !wxUSE_MSGDLG/wxUSE_MSGDLG
}
-#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