Fix 62 harmless but annoying Clang warnings in wxOSX build.

[wxWidgets.git] / src / gtk / textentry.cpp

diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp
index 7b49e1150d3a8a3447a1ca130b65b76d59d4ce90..d631d5889903477764b06c7be692e76bd5076dbd 100644 (file)
--- a/src/gtk/textentry.cpp
+++ b/src/gtk/textentry.cpp
@@ -52,13 +52,19 @@ wx_gtk_insert_text_callback(GtkEditable *editable,
     // we should only be called if we have a max len limit at all
     GtkEntry *entry = GTK_ENTRY (editable);
 
     // we should only be called if we have a max len limit at all
     GtkEntry *entry = GTK_ENTRY (editable);
 

-    wxCHECK_RET( entry->text_max_length, wxT("shouldn't be called") );
+    const int text_length = gtk_entry_get_text_length(entry);
+#if GTK_CHECK_VERSION(3,0,0) || defined(GSEAL_ENABLE)
+    const int text_max_length = gtk_entry_buffer_get_max_length(gtk_entry_get_buffer(entry));
+#else
+    const int text_max_length = entry->text_max_length;
+#endif
+    wxCHECK_RET(text_max_length, "shouldn't be called");

 
     // check that we don't overflow the max length limit
     //
     // FIXME: this doesn't work when we paste a string which is going to be
     //        truncated
 
     // check that we don't overflow the max length limit
     //
     // FIXME: this doesn't work when we paste a string which is going to be
     //        truncated

-    if ( entry->text_length == entry->text_max_length )
+    if (text_length == text_max_length)

     {
         // we don't need to run the base class version at all
         g_signal_stop_emission_by_name (editable, "insert_text");
     {
         // we don't need to run the base class version at all
         g_signal_stop_emission_by_name (editable, "insert_text");


@@ -179,7 +185,7 @@ long wxTextEntry::GetLastPosition() const
     // GtkEntries
     GtkEntry * const entry = GTK_ENTRY(GetEditable());
 
     // GtkEntries
     GtkEntry * const entry = GTK_ENTRY(GetEditable());
 

-    return entry ? entry->text_length : - 1;
+    return entry ? gtk_entry_get_text_length(entry) : -1;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -198,6 +204,16 @@ void wxTextEntry::SetSelection(long from, long to)
     // insertion point is set to the start of the selection and not its end as
     // GTK+ does by default
     gtk_editable_select_region(GetEditable(), to, from);
     // insertion point is set to the start of the selection and not its end as
     // GTK+ does by default
     gtk_editable_select_region(GetEditable(), to, from);

+
+    // avoid reported problem with RHEL 5 GTK+ 2.10 where selection is reset by
+    // a clipboard callback, see #13277
+    if (gtk_check_version(2,12,0))
+    {
+        GtkEntry* entry = GTK_ENTRY(GetEditable());
+        if (to < 0)
+            to = entry->text_length;
+        entry->selection_bound = to;
+    }

 }
 
 void wxTextEntry::GetSelection(long *from, long *to) const
 }
 
 void wxTextEntry::GetSelection(long *from, long *to) const


@@ -231,7 +247,7 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 // auto completion
 // ----------------------------------------------------------------------------
 
 // auto completion
 // ----------------------------------------------------------------------------
 

-bool wxTextEntry::AutoComplete(const wxArrayString& choices)
+bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)

 {
     GtkEntry * const entry = GTK_ENTRY(GetEditable());
     wxCHECK_MSG(entry, false, "auto completion doesn't work with this control");
 {
     GtkEntry * const entry = GTK_ENTRY(GetEditable());
     wxCHECK_MSG(entry, false, "auto completion doesn't work with this control");


@@ -350,7 +366,7 @@ bool wxTextEntry::DoSetMargins(const wxPoint& margins)
     #if GTK_CHECK_VERSION(2,14,0)
         newBorder = gtk_border_new();
     #else
     #if GTK_CHECK_VERSION(2,14,0)
         newBorder = gtk_border_new();
     #else

-        newBorder = new GtkBorder;
+        newBorder = g_slice_new0(GtkBorder);

     #endif
         // Use some reasonable defaults for initial margins
         newBorder->left = 2;
     #endif
         // Use some reasonable defaults for initial margins
         newBorder->left = 2;


@@ -370,6 +386,12 @@ bool wxTextEntry::DoSetMargins(const wxPoint& margins)
 
     gtk_entry_set_inner_border(entry, newBorder);
 
 
     gtk_entry_set_inner_border(entry, newBorder);
 

+#if GTK_CHECK_VERSION(2,14,0)
+    gtk_border_free(newBorder);
+#else
+    g_slice_free(GtkBorder, newBorder);
+#endif
+

     return true;
 #else
     wxUnusedVar(margins);
     return true;
 #else
     wxUnusedVar(margins);