fix setting the font for a single-line text control (bug 508169)

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 48cb8c1e774f126babfdbbe9de5ccb291b6348df..8dff685433d179120daa1479f3e8dbddb5362fe4 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -1004,7 +1004,7 @@ bool wxTextCtrl::SetFont( const wxFont &font )
 {
     wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
 
 {
     wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
 

-    if ( !wxWindowBase::SetFont(font) )
+    if ( !wxTextCtrlBase::SetFont(font) )

     {
         // font didn't change, nothing to do
         return FALSE;
     {
         // font didn't change, nothing to do
         return FALSE;

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 48cb8c1e774f126babfdbbe9de5ccb291b6348df..8dff685433d179120daa1479f3e8dbddb5362fe4 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -1004,7 +1004,7 @@ bool wxTextCtrl::SetFont( const wxFont &font )
 {
     wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
 
 {
     wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
 

-    if ( !wxWindowBase::SetFont(font) )
+    if ( !wxTextCtrlBase::SetFont(font) )

     {
         // font didn't change, nothing to do
         return FALSE;
     {
         // font didn't change, nothing to do
         return FALSE;