wxGTK1 compilation fixes after last changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
// 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
|
// which should be caught by our gtk_notebook_page_change_callback which
|
||||||
// should have reset the flag to false, check it:
|
// should have reset the flag to false, check it:
|
||||||
wxASSERT_LEVEL_2(
|
wxASSERT_LEVEL_2_MSG(
|
||||||
(flags & SetSelection_SendEvent) || !m_skipNextPageChangeEvent,
|
(flags & SetSelection_SendEvent) || !m_skipNextPageChangeEvent,
|
||||||
"internal error in selection events generation"
|
"internal error in selection events generation"
|
||||||
);
|
);
|
||||||
|
@@ -239,7 +239,7 @@ extern bool g_mainThreadLocked;
|
|||||||
#if wxUSE_THREADS
|
#if wxUSE_THREADS
|
||||||
# define DEBUG_MAIN_THREAD \
|
# define DEBUG_MAIN_THREAD \
|
||||||
wxASSERT_MSG( !g_mainThreadLocked || !wxThread::IsMain(), \
|
wxASSERT_MSG( !g_mainThreadLocked || !wxThread::IsMain(), \
|
||||||
"GUI reentrancy detected" )
|
"GUI reentrancy detected" );
|
||||||
#else
|
#else
|
||||||
# define DEBUG_MAIN_THREAD
|
# define DEBUG_MAIN_THREAD
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user