add support for table border width attribute (closes #10610)

[wxWidgets.git] / src / gtk / app.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 18c05dda50e4904e76f0819a70913def3d33106e..c349227bce2dc8db8cc1a231cd6f00415cfaceee 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -115,7 +115,8 @@ bool wxApp::DoIdle()
         id_save = m_idleSourceId;
         m_idleSourceId = 0;
         wx_add_idle_hooks();
         id_save = m_idleSourceId;
         m_idleSourceId = 0;
         wx_add_idle_hooks();

-#ifdef __WXDEBUG__
+
+#if wxDEBUG_LEVEL

         // don't generate the idle events while the assert modal dialog is shown,
         // this matches the behavior of wxMSW
         if (m_isInAssert)
         // don't generate the idle events while the assert modal dialog is shown,
         // this matches the behavior of wxMSW
         if (m_isInAssert)


@@ -181,9 +182,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-#ifdef __WXDEBUG__

     m_isInAssert = false;
     m_isInAssert = false;

-#endif // __WXDEBUG__
+

 #if wxUSE_THREADS
     m_idleMutex = NULL;
 #endif
 #if wxUSE_THREADS
     m_idleMutex = NULL;
 #endif


@@ -498,25 +498,30 @@ bool wxApp::EventsPending()
     return gtk_events_pending() != 0;
 }
 
     return gtk_events_pending() != 0;
 }
 

-#ifdef __WXDEBUG__
-

 void wxApp::OnAssertFailure(const wxChar *file,
                             int line,
                             const wxChar* func,
                             const wxChar* cond,
                             const wxChar *msg)
 {
 void wxApp::OnAssertFailure(const wxChar *file,
                             int line,
                             const wxChar* func,
                             const wxChar* cond,
                             const wxChar *msg)
 {

-
+    // there is no need to do anything if asserts are disabled in this build
+    // anyhow
+#if wxDEBUG_LEVEL

     // block wx idle events while assert dialog is showing
     m_isInAssert = true;
 
     wxAppBase::OnAssertFailure(file, line, func, cond, msg);
 
     m_isInAssert = false;
     // block wx idle events while assert dialog is showing
     m_isInAssert = true;
 
     wxAppBase::OnAssertFailure(file, line, func, cond, msg);
 
     m_isInAssert = false;

+#else // !wxDEBUG_LEVEL
+    wxUnusedVar(file);
+    wxUnusedVar(line);
+    wxUnusedVar(func);
+    wxUnusedVar(cond);
+    wxUnusedVar(msg);
+#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL

 }
 
 }
 

-#endif // __WXDEBUG__
-

 #if wxUSE_THREADS
 void wxGUIAppTraits::MutexGuiEnter()
 {
 #if wxUSE_THREADS
 void wxGUIAppTraits::MutexGuiEnter()
 {