X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d4cc5b600332bbdb3173ea1dbb4fa5e817cfaa1..36bd690299dc72d49c4a945fa467ac7ce2342019:/src/gtk/textctrl.cpp

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 841605437b..91caedb0d7 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());
 
         }
@@ -754,6 +756,20 @@ bool wxTextCtrl::Enable( bool enable )
     if (m_windowStyle & wxTE_MULTILINE)
     {
         gtk_text_set_editable( GTK_TEXT(m_text), enable );
+
+	// If we have a custom background colour, we use this colour in both
+	// disabled and enabled mode, or we end up with a different colour under the
+	// text.
+        wxColour oldColour = GetBackgroundColour();
+        if (oldColour.Ok())
+        {
+            // Need to set twice or it'll optimize the useful stuff out
+            if (oldColour == * wxWHITE)
+                SetBackgroundColour(*wxBLACK);
+            else
+                SetBackgroundColour(*wxWHITE);
+            SetBackgroundColour(oldColour);
+        }
     }
     else
     {