From: Vadim Zeitlin Date: Sun, 22 Mar 2009 13:29:52 +0000 (+0000) Subject: wxGTK1 compilation fixes after last changes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/70aca4d95345d752c6a30bacbedcc3bf013b5309 wxGTK1 compilation fixes after last changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 1b953423e0..22e96ee172 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -433,7 +433,7 @@ int wxNotebook::DoSetSelection( size_t page, int flags ) // gtk_notebook_set_current_page is supposed to emit the switch-page signal // which should be caught by our gtk_notebook_page_change_callback which // should have reset the flag to false, check it: - wxASSERT_LEVEL_2( + wxASSERT_LEVEL_2_MSG( (flags & SetSelection_SendEvent) || !m_skipNextPageChangeEvent, "internal error in selection events generation" ); diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 87a178d91e..a670cf9099 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -239,7 +239,7 @@ extern bool g_mainThreadLocked; #if wxUSE_THREADS # define DEBUG_MAIN_THREAD \ wxASSERT_MSG( !g_mainThreadLocked || !wxThread::IsMain(), \ - "GUI reentrancy detected" ) + "GUI reentrancy detected" ); #else # define DEBUG_MAIN_THREAD #endif