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

Applied patch #418555: wxTextCtrl uses wrong background colour

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-05-16 12:01:48 +00:00
parent 19b726bbca
commit a88acabdd2
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gtk/textctrl.cpp
View File

@@ -393,7 +393,9 @@ bool wxTextCtrl::Create( wxWindow *parent,
gtk_signal_connect( GTK_OBJECT(m_text), "changed", gtk_signal_connect( GTK_OBJECT(m_text), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); 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() ); SetForegroundColour( parent->GetForegroundColour() );
m_cursor = wxCursor( wxCURSOR_IBEAM ); m_cursor = wxCursor( wxCURSOR_IBEAM );
@@ -524,14 +526,14 @@ void wxTextCtrl::AppendText( const wxString &text )
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
bool hasSpecialAttributes = m_font.Ok() || bool hasSpecialAttributes = m_font.Ok() ||
m_foregroundColour.Ok() || m_foregroundColour.Ok();
m_backgroundColour.Ok();
if ( hasSpecialAttributes ) if ( hasSpecialAttributes )
{ {
gtk_text_insert( GTK_TEXT(m_text), gtk_text_insert( GTK_TEXT(m_text),
m_font.GetInternalFont(), m_font.GetInternalFont(),
m_foregroundColour.GetColor(), m_foregroundColour.GetColor(),
m_backgroundColour.GetColor(), m_backgroundColour.Ok() ?
m_backgroundColour.GetColor(): NULL,
text.mbc_str(), text.length()); text.mbc_str(), text.length());
} }

10
src/gtk1/textctrl.cpp
View File

@@ -393,7 +393,9 @@ bool wxTextCtrl::Create( wxWindow *parent,
gtk_signal_connect( GTK_OBJECT(m_text), "changed", gtk_signal_connect( GTK_OBJECT(m_text), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this); 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() ); SetForegroundColour( parent->GetForegroundColour() );
m_cursor = wxCursor( wxCURSOR_IBEAM ); m_cursor = wxCursor( wxCURSOR_IBEAM );
@@ -524,14 +526,14 @@ void wxTextCtrl::AppendText( const wxString &text )
if (m_windowStyle & wxTE_MULTILINE) if (m_windowStyle & wxTE_MULTILINE)
{ {
bool hasSpecialAttributes = m_font.Ok() || bool hasSpecialAttributes = m_font.Ok() ||
m_foregroundColour.Ok() || m_foregroundColour.Ok();
m_backgroundColour.Ok();
if ( hasSpecialAttributes ) if ( hasSpecialAttributes )
{ {
gtk_text_insert( GTK_TEXT(m_text), gtk_text_insert( GTK_TEXT(m_text),
m_font.GetInternalFont(), m_font.GetInternalFont(),
m_foregroundColour.GetColor(), m_foregroundColour.GetColor(),
m_backgroundColour.GetColor(), m_backgroundColour.Ok() ?
m_backgroundColour.GetColor(): NULL,
text.mbc_str(), text.length()); text.mbc_str(), text.length());
} }