From 22800f325f129a140280a74ea50b0525acea91bb Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 29 Jul 2004 20:21:02 +0000 Subject: [PATCH] Can't use directives within a macro git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/textctrl.cpp | 10 ++++++---- src/gtk1/textctrl.cpp | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 61279a64f4..94718d2f35 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -1435,12 +1435,14 @@ void wxTextCtrl::ChangeFontGlobally() // possible! // // TODO: it can be implemented much more efficiently for GTK2 - wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) #ifndef __WXGTK20__ - && m_updateFont -#endif // GTK+ 1.x - , + wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont, + _T("shouldn't be called for single line controls") ); +#else + wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE), + _T("shouldn't be called for single line controls") ); +#endif wxString value = GetValue(); if ( !value.IsEmpty() ) diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 61279a64f4..94718d2f35 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -1435,12 +1435,14 @@ void wxTextCtrl::ChangeFontGlobally() // possible! // // TODO: it can be implemented much more efficiently for GTK2 - wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) #ifndef __WXGTK20__ - && m_updateFont -#endif // GTK+ 1.x - , + wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont, + _T("shouldn't be called for single line controls") ); +#else + wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE), + _T("shouldn't be called for single line controls") ); +#endif wxString value = GetValue(); if ( !value.IsEmpty() ) -- 2.47.2