From a88acabdd2be91a59ce96017fdcd5a661fcb3c3e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Wed, 16 May 2001 12:01:48 +0000 Subject: [PATCH] Applied patch #418555: wxTextCtrl uses wrong background colour git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10175 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 841605437b..5572e67ad3 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -393,7 +393,9 @@ bool wxTextCtrl::Create( wxWindow *parent, gtk_signal_connect( GTK_OBJECT(m_text), "changed", GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ); + /* we don't set a valid background colour, because the window + manager should use a default one */ + m_backgroundColour = wxColour(); SetForegroundColour( parent->GetForegroundColour() ); m_cursor = wxCursor( wxCURSOR_IBEAM ); @@ -524,14 +526,14 @@ void wxTextCtrl::AppendText( const wxString &text ) if (m_windowStyle & wxTE_MULTILINE) { bool hasSpecialAttributes = m_font.Ok() || - m_foregroundColour.Ok() || - m_backgroundColour.Ok(); + m_foregroundColour.Ok(); if ( hasSpecialAttributes ) { gtk_text_insert( GTK_TEXT(m_text), m_font.GetInternalFont(), m_foregroundColour.GetColor(), - m_backgroundColour.GetColor(), + m_backgroundColour.Ok() ? + m_backgroundColour.GetColor(): NULL, text.mbc_str(), text.length()); } diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp index 841605437b..5572e67ad3 100644 --- a/src/gtk1/textctrl.cpp +++ b/src/gtk1/textctrl.cpp @@ -393,7 +393,9 @@ bool wxTextCtrl::Create( wxWindow *parent, gtk_signal_connect( GTK_OBJECT(m_text), "changed", GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); - SetBackgroundColour( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ); + /* we don't set a valid background colour, because the window + manager should use a default one */ + m_backgroundColour = wxColour(); SetForegroundColour( parent->GetForegroundColour() ); m_cursor = wxCursor( wxCURSOR_IBEAM ); @@ -524,14 +526,14 @@ void wxTextCtrl::AppendText( const wxString &text ) if (m_windowStyle & wxTE_MULTILINE) { bool hasSpecialAttributes = m_font.Ok() || - m_foregroundColour.Ok() || - m_backgroundColour.Ok(); + m_foregroundColour.Ok(); if ( hasSpecialAttributes ) { gtk_text_insert( GTK_TEXT(m_text), m_font.GetInternalFont(), m_foregroundColour.GetColor(), - m_backgroundColour.GetColor(), + m_backgroundColour.Ok() ? + m_backgroundColour.GetColor(): NULL, text.mbc_str(), text.length()); } -- 2.45.2