yet another fix for wxTextCtrl bg colour (patch 462838)

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 35de57809a7bc4356f3516b039bcc9ad03596a7f..ec25530e465011016aea9312311fc8f97e34aa4a 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -325,10 +325,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 
-    // FIXME: is the bg colour correct here?
-    wxTextAttr attrDef( colFg,
-                        wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW),
-                        parent->GetFont() );
+    wxTextAttr attrDef( colFg, m_backgroundColour, parent->GetFont() );
     SetDefaultStyle( attrDef );
 
     Show( TRUE );

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 35de57809a7bc4356f3516b039bcc9ad03596a7f..ec25530e465011016aea9312311fc8f97e34aa4a 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -325,10 +325,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 
-    // FIXME: is the bg colour correct here?
-    wxTextAttr attrDef( colFg,
-                        wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW),
-                        parent->GetFont() );
+    wxTextAttr attrDef( colFg, m_backgroundColour, parent->GetFont() );
     SetDefaultStyle( attrDef );
 
     Show( TRUE );