Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guard functions with wxCHECK_* macros rather than wxASSERT_*

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-12-17 17:44:06 +00:00
parent 08f8f5311f
commit 8f134c9a28
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/toplevel.cpp
View File

@@ -957,7 +957,7 @@ void wxTopLevelWindowGTK::Refresh( bool WXUNUSED(eraseBackground), const wxRect
bool wxTopLevelWindowGTK::Show( bool show ) bool wxTopLevelWindowGTK::Show( bool show )
{ {
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); wxCHECK_MSG(m_widget, false, "invalid frame");
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
bool deferShow = show && !m_isShown && m_deferShow; bool deferShow = show && !m_isShown && m_deferShow;
@@ -1190,7 +1190,7 @@ void wxTopLevelWindowGTK::DoSetClientSize(int width, int height)
void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
{ {
wxASSERT_MSG(m_widget, wxT("invalid frame")); wxCHECK_RET(m_widget, "invalid frame");
if ( IsIconized() ) if ( IsIconized() )
{ {
@@ -1371,7 +1371,7 @@ void wxTopLevelWindowGTK::OnInternalIdle()
void wxTopLevelWindowGTK::SetTitle( const wxString &title ) void wxTopLevelWindowGTK::SetTitle( const wxString &title )
{ {
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); wxCHECK_RET(m_widget, "invalid frame");
if ( title == m_title ) if ( title == m_title )
return; return;