]> git.saurik.com Git - wxWidgets.git/blame - src/gtk/app.cpp
1. don't assert if we're passed an empty defaultDir and full path in
[wxWidgets.git] / src / gtk / app.cpp
CommitLineData
c801d85f 1/////////////////////////////////////////////////////////////////////////////
88a7a4e1 2// Name: src/gtk/app.cpp
c801d85f
KB
3// Purpose:
4// Author: Robert Roebling
32e9da8b 5// Id: $Id$
01111366 6// Copyright: (c) 1998 Robert Roebling, Julian Smart
65571936 7// Licence: wxWindows licence
c801d85f
KB
8/////////////////////////////////////////////////////////////////////////////
9
df744f4d 10#ifdef __VMS
f3858bf5
JJ
11// vms_jackets.h should for proper working be included before anything else
12# include <vms_jackets.h>
ff7d1dcb 13#undef ConnectionNumber
df744f4d
JJ
14#endif
15
f3858bf5
JJ
16// For compilers that support precompilation, includes "wx.h".
17#include "wx/wxprec.h"
18
c801d85f 19#include "wx/app.h"
88a7a4e1
WS
20
21#ifndef WX_PRECOMP
22 #include "wx/intl.h"
e4db172a 23 #include "wx/log.h"
de6185e2 24 #include "wx/utils.h"
5b56bffb 25 #include "wx/memory.h"
48a1108e 26 #include "wx/font.h"
88a7a4e1
WS
27#endif
28
b1ac3b56 29#include "wx/file.h"
2b5f62a0 30#include "wx/filename.h"
fe593cc5 31#include "wx/thread.h"
afb74891 32
62be94e1 33#ifdef __WXGPE__
88a7a4e1 34 #include <gpe/init.h>
62be94e1
RR
35#endif
36
df028524
VS
37#ifdef __WXUNIVERSAL__
38 #include "wx/univ/theme.h"
39 #include "wx/univ/renderer.h"
40#endif
41
20e05ffb 42#include <unistd.h>
2b5f62a0
VZ
43
44#ifdef HAVE_POLL
45 #if defined(__VMS)
46 #include <poll.h>
47 #else
48 // bug in the OpenBSD headers: at least in 3.1 there is no extern "C"
49 // in neither poll.h nor sys/poll.h which results in link errors later
50 #ifdef __OPENBSD__
51 extern "C"
52 {
53 #endif
54
55 #include <sys/poll.h>
56
57 #ifdef __OPENBSD__
58 };
59 #endif
60 #endif // platform
61#else // !HAVE_POLL
62 // we implement poll() ourselves using select() which is supposed exist in
63 // all modern Unices
64 #include <sys/types.h>
65 #include <sys/time.h>
66 #include <unistd.h>
bc023abb
MW
67 #ifdef HAVE_SYS_SELECT_H
68 #include <sys/select.h>
69 #endif
2b5f62a0
VZ
70#endif // HAVE_POLL/!HAVE_POLL
71
17a1ebd1 72#include "wx/unix/private.h"
e8106239 73#include "wx/gtk/win_gtk.h"
84833214 74#include "wx/gtk/private.h"
c801d85f 75
c259ffdf 76#include <gdk/gdkx.h>
24178e4a 77
2b850ae1
RR
78//-----------------------------------------------------------------------------
79// link GnomeVFS
80//-----------------------------------------------------------------------------
81
82#if wxUSE_LIBGNOMEVFS
83#include "wx/html/forcelnk.h"
84FORCE_LINK(gnome_vfs)
85#endif
86
c801d85f
KB
87//-----------------------------------------------------------------------------
88// global data
89//-----------------------------------------------------------------------------
90
de6185e2 91bool g_mainThreadLocked = false;
3ac8d3bc 92
c2fa61e8 93static GtkWidget *gs_RootWindow = (GtkWidget*) NULL;
d76fe38b 94
c801d85f 95//-----------------------------------------------------------------------------
3133cb9f 96// idle system
c801d85f
KB
97//-----------------------------------------------------------------------------
98
90350682 99void wxapp_install_idle_handler();
bf9e3e73 100
fe593cc5
VS
101#if wxUSE_THREADS
102static wxMutex gs_idleTagsMutex;
103#endif
104
bf9e3e73
RR
105//-----------------------------------------------------------------------------
106// wxYield
107//-----------------------------------------------------------------------------
53a8af59 108
1ee339ee
VZ
109// not static because used by textctrl.cpp
110//
111// MT-FIXME
88a7a4e1 112bool wxIsInsideYield = false;
1ee339ee 113
8461e4c2 114bool wxApp::Yield(bool onlyIfNeeded)
c801d85f 115{
1ee339ee 116 if ( wxIsInsideYield )
8461e4c2
VZ
117 {
118 if ( !onlyIfNeeded )
119 {
120 wxFAIL_MSG( wxT("wxYield called recursively" ) );
121 }
122
88a7a4e1 123 return false;
8461e4c2
VZ
124 }
125
6dc5fd71
VZ
126#if wxUSE_THREADS
127 if ( !wxThread::IsMain() )
128 {
129 // can't call gtk_main_iteration() from other threads like this
88a7a4e1 130 return true;
6dc5fd71
VZ
131 }
132#endif // wxUSE_THREADS
133
88a7a4e1 134 wxIsInsideYield = true;
e90c1d2a 135
c263eb03
VS
136 // We need to remove idle callbacks or the loop will
137 // never finish.
8a378a9e 138 RemoveIdleSource();
acfd422a 139
dd7641ef 140#if wxUSE_LOG
2ed3265e
VZ
141 // disable log flushing from here because a call to wxYield() shouldn't
142 // normally result in message boxes popping up &c
143 wxLog::Suspend();
dd7641ef 144#endif
2ed3265e 145
406a6f6b
VZ
146 while (gtk_events_pending())
147 gtk_main_iteration();
148
5375a1f5
RR
149 // It's necessary to call ProcessIdle() to update the frames sizes which
150 // might have been changed (it also will update other things set from
be88a6ad 151 // OnUpdateUI() which is a nice (and desired) side effect). But we
5375a1f5
RR
152 // call ProcessIdle() only once since this is not meant for longish
153 // background jobs (controlled by wxIdleEvent::RequestMore() and the
154 // return value of Processidle().
155 ProcessIdle();
2ed3265e 156
dd7641ef 157#if wxUSE_LOG
2ed3265e
VZ
158 // let the logs be flashed again
159 wxLog::Resume();
dd7641ef 160#endif
7741c4e1 161
88a7a4e1 162 wxIsInsideYield = false;
99ba739f 163
88a7a4e1 164 return true;
acfd422a
RR
165}
166
bf9e3e73
RR
167//-----------------------------------------------------------------------------
168// wxWakeUpIdle
169//-----------------------------------------------------------------------------
170
68567a96
MR
171// RR/KH: No wxMutexGui calls are needed here according to the GTK faq,
172// http://www.gtk.org/faq/#AEN500 - this caused problems for wxPostEvent.
19722331 173
e2478fde 174void wxApp::WakeUpIdle()
bf9e3e73 175{
c263eb03 176 wxapp_install_idle_handler();
bf9e3e73
RR
177}
178
179//-----------------------------------------------------------------------------
180// local functions
181//-----------------------------------------------------------------------------
182
90350682
VZ
183// the callback functions must be extern "C" to comply with GTK+ declarations
184extern "C"
185{
186
14819684
PC
187// One-shot emission hook for "event" signal, to install idle handler.
188// This will be called when the "event" signal is issued on any GtkWidget object.
189static gboolean
190event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
191{
192 wxapp_install_idle_handler();
193 // remove hook
194 return false;
195}
196
176d9824 197// add emission hook for "event" signal, to re-install idle handler when needed
8a378a9e
PC
198static inline void wxAddEmissionHook()
199{
176d9824
PC
200 GType widgetType = GTK_TYPE_WIDGET;
201 // if GtkWidget type is loaded
202 if (g_type_class_peek(widgetType) != NULL)
203 {
204 guint sig_id = g_signal_lookup("event", widgetType);
205 g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
206 }
8a378a9e
PC
207}
208
3133cb9f 209static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
96997d65 210{
a5f1fd3e 211 if (!wxTheApp)
1136ac0b 212 return false;
a5f1fd3e
VZ
213
214#ifdef __WXDEBUG__
6d477bb4
VZ
215 // don't generate the idle events while the assert modal dialog is shown,
216 // this completely confuses the apps which don't expect to be reentered
217 // from some safely-looking functions
a5f1fd3e 218 if ( wxTheApp->IsInAssert() )
1136ac0b 219 return false;
a5f1fd3e 220#endif // __WXDEBUG__
c2fa61e8 221
5375a1f5 222 // When getting called from GDK's time-out handler
924ef850 223 // we are no longer within GDK's grab on the GUI
5375a1f5 224 // thread so we must lock it here ourselves.
924ef850 225 gdk_threads_enter();
094637f6 226
0faa7620 227 bool moreIdles;
8ab9a536 228
3133cb9f 229 // Send idle event to all who request them as long as
5375a1f5 230 // no events have popped up in the event queue.
0faa7620 231 while ( (moreIdles = wxTheApp->ProcessIdle()) && gtk_events_pending() == 0)
6d477bb4 232 ;
c9e35272 233
96997d65 234 // Release lock again
924ef850 235 gdk_threads_leave();
acfd422a 236
14819684 237 if (!moreIdles)
9a5c9a0c
PC
238 {
239#if wxUSE_THREADS
240 wxMutexLocker lock(gs_idleTagsMutex);
241#endif
242 // Indicate that we are now in idle mode and event handlers
243 // will have to reinstall the idle handler again.
244 g_isIdle = true;
245 wxTheApp->m_idleTag = 0;
246
8a378a9e 247 wxAddEmissionHook();
9a5c9a0c 248 }
14819684 249
8ab9a536
RR
250 // Return FALSE if no more idle events are to be sent
251 return moreIdles;
acfd422a 252}
8801832d 253
90350682
VZ
254#if wxUSE_THREADS
255
2b5f62a0
VZ
256#ifdef HAVE_POLL
257 #define wxPoll poll
258 #define wxPollFd pollfd
259#else // !HAVE_POLL
260
261typedef GPollFD wxPollFd;
262
263int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
264{
265 // convert timeout from ms to struct timeval (s/us)
266 timeval tv_timeout;
267 tv_timeout.tv_sec = timeout/1000;
268 tv_timeout.tv_usec = (timeout%1000)*1000;
269
270 // remember the highest fd used here
271 int fdMax = -1;
272
273 // and fill the sets for select()
274 fd_set readfds;
275 fd_set writefds;
276 fd_set exceptfds;
17a1ebd1
VZ
277 wxFD_ZERO(&readfds);
278 wxFD_ZERO(&writefds);
279 wxFD_ZERO(&exceptfds);
2b5f62a0
VZ
280
281 unsigned int i;
282 for ( i = 0; i < nfds; i++ )
283 {
7f5ff1b2 284 wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") );
2b5f62a0
VZ
285
286 if ( ufds[i].events & G_IO_IN )
17a1ebd1 287 wxFD_SET(ufds[i].fd, &readfds);
2b5f62a0
VZ
288
289 if ( ufds[i].events & G_IO_PRI )
17a1ebd1 290 wxFD_SET(ufds[i].fd, &exceptfds);
2b5f62a0
VZ
291
292 if ( ufds[i].events & G_IO_OUT )
17a1ebd1 293 wxFD_SET(ufds[i].fd, &writefds);
2b5f62a0
VZ
294
295 if ( ufds[i].fd > fdMax )
296 fdMax = ufds[i].fd;
297 }
298
299 fdMax++;
300 int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout);
301
302 // translate the results back
303 for ( i = 0; i < nfds; i++ )
304 {
305 ufds[i].revents = 0;
306
17a1ebd1 307 if ( wxFD_ISSET(ufds[i].fd, &readfds ) )
2b5f62a0
VZ
308 ufds[i].revents |= G_IO_IN;
309
17a1ebd1 310 if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) )
2b5f62a0
VZ
311 ufds[i].revents |= G_IO_PRI;
312
17a1ebd1 313 if ( wxFD_ISSET(ufds[i].fd, &writefds ) )
2b5f62a0
VZ
314 ufds[i].revents |= G_IO_OUT;
315 }
316
317 return res;
318}
319
320#endif // HAVE_POLL/!HAVE_POLL
321
3133cb9f 322static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
acfd422a 323{
90350682 324 gdk_threads_enter();
7b90a8f2 325
90350682 326 wxMutexGuiLeave();
e4db172a 327 g_mainThreadLocked = true;
7941ba11 328
2b5f62a0
VZ
329 // we rely on the fact that glib GPollFD struct is really just pollfd but
330 // I wonder how wise is this in the long term (VZ)
331 gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );
90350682 332
90350682 333 wxMutexGuiEnter();
de6185e2 334 g_mainThreadLocked = false;
90350682 335
90350682
VZ
336 gdk_threads_leave();
337
3133cb9f 338 return res;
ff7b1510 339}
c801d85f 340
90350682
VZ
341#endif // wxUSE_THREADS
342
343} // extern "C"
344
3133cb9f 345void wxapp_install_idle_handler()
b453e1b2 346{
7482aa19
PC
347 if (wxTheApp == NULL)
348 return;
349
fe593cc5
VS
350#if wxUSE_THREADS
351 wxMutexLocker lock(gs_idleTagsMutex);
352#endif
353
c263eb03
VS
354 // Don't install the handler if it's already installed. This test *MUST*
355 // be done when gs_idleTagsMutex is locked!
356 if (!g_isIdle)
357 return;
358
e8617760
GD
359 // GD: this assert is raised when using the thread sample (which works)
360 // so the test is probably not so easy. Can widget callbacks be
361 // triggered from child threads and, if so, for which widgets?
362 // wxASSERT_MSG( wxThread::IsMain() || gs_WakeUpIdle, wxT("attempt to install idle handler from widget callback in child thread (should be exclusively from wxWakeUpIdle)") );
d5f3e1eb 363
3133cb9f 364 wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );
c2fa61e8 365
de6185e2 366 g_isIdle = false;
96997d65 367
3133cb9f
RR
368 // This routine gets called by all event handlers
369 // indicating that the idle is over. It may also
370 // get called from other thread for sending events
371 // to the main thread (and processing these in
372 // idle time). Very low priority.
6a555739 373 wxTheApp->m_idleTag = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL);
b453e1b2
RR
374}
375
005f5d18
RR
376//-----------------------------------------------------------------------------
377// Access to the root window global
378//-----------------------------------------------------------------------------
379
380GtkWidget* wxGetRootWindow()
381{
382 if (gs_RootWindow == NULL)
383 {
384 gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL );
385 gtk_widget_realize( gs_RootWindow );
386 }
387 return gs_RootWindow;
388}
389
c801d85f
KB
390//-----------------------------------------------------------------------------
391// wxApp
392//-----------------------------------------------------------------------------
393
394IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
395
53010e52 396BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
955a9197 397 EVT_IDLE(wxAppBase::OnIdle)
53010e52
RR
398END_EVENT_TABLE()
399
c801d85f
KB
400wxApp::wxApp()
401{
a5f1fd3e 402#ifdef __WXDEBUG__
de6185e2 403 m_isInAssert = false;
a5f1fd3e
VZ
404#endif // __WXDEBUG__
405
df5ddbca 406 m_idleTag = 0;
e4db172a 407 g_isIdle = true;
df5ddbca 408 wxapp_install_idle_handler();
094637f6 409
6b3eb77a 410#if wxUSE_THREADS
15894949 411 g_main_context_set_poll_func( NULL, wxapp_poll_func );
6b3eb77a 412#endif
60acb947 413
a6f5aa49
VZ
414 // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
415 m_glVisualInfo = (void *) NULL;
34a34b02 416 m_glFBCInfo = (void *) NULL;
ff7b1510 417}
c801d85f 418
60acb947 419wxApp::~wxApp()
c801d85f 420{
5d038ec5
MR
421 if (m_idleTag)
422 g_source_remove( m_idleTag );
ff7b1510 423}
c801d85f 424
0d2a2b60 425bool wxApp::OnInitGui()
c801d85f 426{
1e6feb95 427 if ( !wxAppBase::OnInitGui() )
de6185e2 428 return false;
1e6feb95 429
a6f5aa49
VZ
430 // if this is a wxGLApp (derived from wxApp), and we've already
431 // chosen a specific visual, then derive the GdkVisual from that
005f5d18
RR
432 if (m_glVisualInfo != NULL)
433 {
a6f5aa49 434 GdkVisual* vis = gtk_widget_get_default_visual();
a6f5aa49
VZ
435
436 GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
437 gtk_widget_set_default_colormap( colormap );
a6f5aa49 438 }
005f5d18 439 else
b134516c 440 {
c77eea28
RR
441 // On some machines, the default visual is just 256 colours, so
442 // we make sure we get the best. This can sometimes be wasteful.
443 if (m_useBestVisual)
444 {
445 if (m_forceTrueColour)
446 {
447 GdkVisual* visual = gdk_visual_get_best_with_both( 24, GDK_VISUAL_TRUE_COLOR );
448 if (!visual)
449 {
450 wxLogError(wxT("Unable to initialize TrueColor visual."));
451 return false;
452 }
453 GdkColormap *colormap = gdk_colormap_new( visual, FALSE );
454 gtk_widget_set_default_colormap( colormap );
455 }
456 else
457 {
458 if (gdk_visual_get_best() != gdk_visual_get_system())
459 {
460 GdkVisual* visual = gdk_visual_get_best();
461 GdkColormap *colormap = gdk_colormap_new( visual, FALSE );
462 gtk_widget_set_default_colormap( colormap );
463 }
464 }
465 }
f6fcbb63 466 }
c801d85f 467
88a7a4e1 468 return true;
bbe0af5b
RR
469}
470
005f5d18
RR
471GdkVisual *wxApp::GetGdkVisual()
472{
473 GdkVisual *visual = NULL;
be88a6ad 474
005f5d18 475 if (m_glVisualInfo)
7b775074 476 visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
005f5d18 477 else
22a3bce4 478 visual = gdk_drawable_get_visual( wxGetRootWindow()->window );
be88a6ad 479
005f5d18 480 wxASSERT( visual );
be88a6ad 481
005f5d18
RR
482 return visual;
483}
484
abca8ebf 485bool wxApp::Initialize(int& argc, wxChar **argv)
c801d85f 486{
c156411a 487 bool init_result;
68567a96 488
924ef850 489#if wxUSE_THREADS
ac131bab
MR
490 if (!g_thread_supported())
491 g_thread_init(NULL);
05e2b077 492#endif // wxUSE_THREADS
2286341c 493
0d2a2b60 494 gtk_set_locale();
c801d85f 495
f9862abd
JS
496 // We should have the wxUSE_WCHAR_T test on the _outside_
497#if wxUSE_WCHAR_T
68567a96
MR
498 // gtk+ 2.0 supports Unicode through UTF-8 strings
499 wxConvCurrent = &wxConvUTF8;
05e2b077
VZ
500#else // !wxUSE_WCHAR_T
501 if (!wxOKlibc())
502 wxConvCurrent = (wxMBConv*) NULL;
503#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
002f4218 504
845905d5
MW
505 // decide which conversion to use for the file names
506
507 // (1) this variable exists for the sole purpose of specifying the encoding
508 // of the filenames for GTK+ programs, so use it if it is set
509 wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
29c326b7 510 encName = encName.BeforeFirst(_T(','));
7c8ec100 511 if (encName.CmpNoCase(_T("@locale")) == 0)
d24b23b7 512 encName.clear();
845905d5 513 encName.MakeUpper();
68567a96 514#if wxUSE_INTL
845905d5
MW
515 if (encName.empty())
516 {
517 // (2) if a non default locale is set, assume that the user wants his
518 // filenames in this locale too
519 encName = wxLocale::GetSystemEncodingName().Upper();
520 // (3) finally use UTF-8 by default
521 if (encName.empty() || encName == _T("US-ASCII"))
522 encName = _T("UTF-8");
523 wxSetEnv(_T("G_FILENAME_ENCODING"), encName);
524 }
525#else
526 if (encName.empty())
527 encName = _T("UTF-8");
528#endif // wxUSE_INTL
529 static wxConvBrokenFileNames fileconv(encName);
530 wxConvFileName = &fileconv;
66bf0099 531
05e2b077
VZ
532#if wxUSE_UNICODE
533 // gtk_init() wants UTF-8, not wchar_t, so convert
534 int i;
0d8dda32 535 char **argvGTK = new char *[argc + 1];
05e2b077 536 for ( i = 0; i < argc; i++ )
924ef850 537 {
05e2b077 538 argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i]));
924ef850 539 }
0cf2cb36 540
05e2b077 541 argvGTK[argc] = NULL;
954de0f1 542
05e2b077 543 int argcGTK = argc;
68567a96 544
62be94e1 545#ifdef __WXGPE__
c156411a 546 init_result = true; // is there a _check() version of this?
62be94e1
RR
547 gpe_application_init( &argcGTK, &argvGTK );
548#else
c156411a 549 init_result = gtk_init_check( &argcGTK, &argvGTK );
62be94e1 550#endif
954de0f1 551
05e2b077 552 if ( argcGTK != argc )
924ef850 553 {
05e2b077
VZ
554 // we have to drop the parameters which were consumed by GTK+
555 for ( i = 0; i < argcGTK; i++ )
556 {
0d8dda32 557 while ( strcmp(wxConvUTF8.cWX2MB(argv[i]), argvGTK[i]) != 0 )
05e2b077
VZ
558 {
559 memmove(argv + i, argv + i + 1, argc - i);
560 }
561 }
0cf2cb36 562
05e2b077 563 argc = argcGTK;
2b5f62a0 564 }
05e2b077 565 //else: gtk_init() didn't modify our parameters
e0253070 566
05e2b077
VZ
567 // free our copy
568 for ( i = 0; i < argcGTK; i++ )
0151c3eb 569 {
05e2b077 570 free(argvGTK[i]);
0151c3eb 571 }
0cf2cb36 572
05e2b077
VZ
573 delete [] argvGTK;
574#else // !wxUSE_UNICODE
575 // gtk_init() shouldn't actually change argv itself (just its contents) so
576 // it's ok to pass pointer to it
c156411a 577 init_result = gtk_init_check( &argc, &argv );
05e2b077 578#endif // wxUSE_UNICODE/!wxUSE_UNICODE
0cf2cb36 579
c156411a
RD
580 if (!init_result) {
581 wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?"));
582 return false;
583 }
68567a96 584
05e2b077
VZ
585 // we can not enter threads before gtk_init is done
586 gdk_threads_enter();
0cf2cb36 587
abca8ebf
VZ
588 if ( !wxAppBase::Initialize(argc, argv) )
589 {
590 gdk_threads_leave();
591
592 return false;
593 }
594
e4db172a 595 wxSetDetectableAutoRepeat( true );
be88a6ad 596
05e2b077
VZ
597#if wxUSE_INTL
598 wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
599#endif
be88a6ad 600
05e2b077
VZ
601 return true;
602}
0cf2cb36 603
05e2b077
VZ
604void wxApp::CleanUp()
605{
05e2b077 606 gdk_threads_leave();
abca8ebf
VZ
607
608 wxAppBase::CleanUp();
ff7b1510 609}
1a56f55c 610
a5f1fd3e
VZ
611#ifdef __WXDEBUG__
612
2d97237d
VZ
613void wxApp::OnAssertFailure(const wxChar *file,
614 int line,
615 const wxChar* func,
616 const wxChar* cond,
617 const wxChar *msg)
a5f1fd3e 618{
8798d146
RR
619 // This doesn't seem to be required anymore. Indeed,
620 // it breaks any code from working after a suppressed
621 // assert.
622 // m_isInAssert = true;
a5f1fd3e 623
2d97237d 624 wxAppBase::OnAssertFailure(file, line, func, cond, msg);
a5f1fd3e 625
8798d146 626 // m_isInAssert = false;
a5f1fd3e
VZ
627}
628
629#endif // __WXDEBUG__
630
8a378a9e 631void wxApp::RemoveIdleSource()
fe593cc5
VS
632{
633#if wxUSE_THREADS
634 wxMutexLocker lock(gs_idleTagsMutex);
635#endif
8a378a9e 636 if (m_idleTag != 0)
c263eb03 637 {
8a378a9e
PC
638 g_source_remove(m_idleTag);
639 m_idleTag = 0;
e4db172a 640 g_isIdle = true;
8a378a9e 641 wxAddEmissionHook();
c263eb03 642 }
fe593cc5 643}