At least under GTK2, we do not need m_widget->window to be non-NULL in order to succe...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 453274792e65a4c73b362607077e67a6e2c2c537..5d4025de68c029d4b23baa4c56278e78b32405f5 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -1483,8 +1483,10 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
     if ( !wxControl::SetBackgroundColour( colour ) )
         return FALSE;
 
     if ( !wxControl::SetBackgroundColour( colour ) )
         return FALSE;
 

+#ifndef __WXGTK20__

     if (!m_widget->window)
         return FALSE;
     if (!m_widget->window)
         return FALSE;

+#endif

 
     if (!m_backgroundColour.Ok())
         return FALSE;
 
     if (!m_backgroundColour.Ok())
         return FALSE;

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 453274792e65a4c73b362607077e67a6e2c2c537..5d4025de68c029d4b23baa4c56278e78b32405f5 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -1483,8 +1483,10 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
     if ( !wxControl::SetBackgroundColour( colour ) )
         return FALSE;
 
     if ( !wxControl::SetBackgroundColour( colour ) )
         return FALSE;
 

+#ifndef __WXGTK20__

     if (!m_widget->window)
         return FALSE;
     if (!m_widget->window)
         return FALSE;

+#endif

 
     if (!m_backgroundColour.Ok())
         return FALSE;
 
     if (!m_backgroundColour.Ok())
         return FALSE;