AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Can't use directives within a macro

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2004-07-29 20:21:02 +00:00
parent 90dedfca12
commit 22800f325f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/textctrl.cpp
View File

@ -1435,12 +1435,14 @@ void wxTextCtrl::ChangeFontGlobally()
// possible! // possible!
// //
// TODO: it can be implemented much more efficiently for GTK2 // TODO: it can be implemented much more efficiently for GTK2
wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE)
#ifndef __WXGTK20__ #ifndef __WXGTK20__
&& m_updateFont wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
#endif // GTK+ 1.x
,
_T("shouldn't be called for single line controls") ); _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(); wxString value = GetValue();
if ( !value.IsEmpty() ) if ( !value.IsEmpty() )

10
src/gtk1/textctrl.cpp
View File

@ -1435,12 +1435,14 @@ void wxTextCtrl::ChangeFontGlobally()
// possible! // possible!
// //
// TODO: it can be implemented much more efficiently for GTK2 // TODO: it can be implemented much more efficiently for GTK2
wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE)
#ifndef __WXGTK20__ #ifndef __WXGTK20__
&& m_updateFont wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
#endif // GTK+ 1.x
,
_T("shouldn't be called for single line controls") ); _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(); wxString value = GetValue();
if ( !value.IsEmpty() ) if ( !value.IsEmpty() )