From f583ba0ffba951d7d8662148f9b1a7734ed8dbc5 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 20 May 2015 23:12:17 -0700 Subject: [PATCH] Avoid GTK warning "invalid cast from 'GtkTextView' to 'GtkEntry'" when using SetHint() closes #16321 --- src/gtk/textctrl.cpp | 5 ++++- src/gtk/textentry.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index 7948f30f1c..af93ccecab 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -851,7 +851,10 @@ GtkEditable *wxTextCtrl::GetEditable() const GtkEntry *wxTextCtrl::GetEntry() const { - return GTK_ENTRY(m_text); + if (GTK_IS_ENTRY(m_text)) + return (GtkEntry*)m_text; + + return NULL; } int wxTextCtrl::GTKIMFilterKeypress(GdkEventKey* event) const diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp index c066fb3c84..804c381f45 100644 --- a/src/gtk/textentry.cpp +++ b/src/gtk/textentry.cpp @@ -521,7 +521,7 @@ bool wxTextEntry::SetHint(const wxString& hint) { #if GTK_CHECK_VERSION(3,2,0) GtkEntry *entry = GetEntry(); - if (entry && GTK_IS_ENTRY(entry) && gtk_check_version(3,2,0) == NULL) + if (entry && gtk_check_version(3,2,0) == NULL) { gtk_entry_set_placeholder_text(entry, wxGTK_CONV(hint)); return true;