applied patch 433352 (fix for wxTextCtrl::SetForegroundColor())

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

diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h
index 0a529c6a2789f32d728084d8eed4bd8d3d5cce72..727e7741f9340c4d9b436716eebb7467c65debc0 100644 (file)
--- a/include/wx/gtk/textctrl.h
+++ b/include/wx/gtk/textctrl.h
@@ -131,7 +131,6 @@ public:
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
     bool SetFont( const wxFont &font );
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
     bool SetFont( const wxFont &font );

-    bool SetForegroundColour(const wxColour &colour);

     bool SetBackgroundColour(const wxColour &colour);
 
     GtkWidget* GetConnectWidget();
     bool SetBackgroundColour(const wxColour &colour);
 
     GtkWidget* GetConnectWidget();

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index 0a529c6a2789f32d728084d8eed4bd8d3d5cce72..727e7741f9340c4d9b436716eebb7467c65debc0 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -131,7 +131,6 @@ public:
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
     bool SetFont( const wxFont &font );
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
     bool SetFont( const wxFont &font );

-    bool SetForegroundColour(const wxColour &colour);

     bool SetBackgroundColour(const wxColour &colour);
 
     GtkWidget* GetConnectWidget();
     bool SetBackgroundColour(const wxColour &colour);
 
     GtkWidget* GetConnectWidget();

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 2ed849a9955165105b75675240ec595f3eb19226..9904ed48a24bdc5d191efd924cade821376201d7 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -1072,14 +1072,6 @@ void wxTextCtrl::UpdateFontIfNeeded()
         ChangeFontGlobally();
 }
 
         ChangeFontGlobally();
 }
 

-bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
-{
-    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
-
-    // doesn't work
-    return FALSE;
-}
-

 bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {
     wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
 bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {
     wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 2ed849a9955165105b75675240ec595f3eb19226..9904ed48a24bdc5d191efd924cade821376201d7 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -1072,14 +1072,6 @@ void wxTextCtrl::UpdateFontIfNeeded()
         ChangeFontGlobally();
 }
 
         ChangeFontGlobally();
 }
 

-bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
-{
-    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
-
-    // doesn't work
-    return FALSE;
-}
-

 bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {
     wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
 bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {
     wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );