return wxString from wxDynamicLibrary::GetDllExt()

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 56d2d05c1fc6f04704b799db0b734be59f2723ef..616a591367e968be4d5aa76b3a9f87f12c1b21de 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -162,12 +162,12 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
 // gtk+ doesn't support justify before gtk+-2.11.0 with pango-1.17 being available
 // (but if new enough pango isn't available it's a mere gtk warning)
 #if GTK_CHECK_VERSION(2,11,0)
-                       case wxTEXT_ALIGNMENT_JUSTIFIED:
+            case wxTEXT_ALIGNMENT_JUSTIFIED:
                 if (!gtk_check_version(2,11,0))
-                                   align = GTK_JUSTIFY_FILL;
+                    align = GTK_JUSTIFY_FILL;
                 else
                     align = GTK_JUSTIFY_LEFT;
-                               break;
+                break;
 #endif
         }
 
@@ -428,7 +428,7 @@ au_check_word( GtkTextIter *s, GtkTextIter *e )
     gtk_text_iter_backward_find_char( &end, pred_nonpunct_or_slash, NULL, &start );
     gtk_text_iter_forward_char(&end);
 
-    gchar* text = gtk_text_iter_get_text( &start, &end );
+    wxGtkString text(gtk_text_iter_get_text( &start, &end ));
     size_t len = strlen(text), prefix_len;
     size_t n;
 
@@ -955,16 +955,12 @@ wxString wxTextCtrl::GetValue() const
         gtk_text_buffer_get_end_iter( m_buffer, &end );
         wxGtkString text(gtk_text_buffer_get_text(m_buffer, &start, &end, true));
 
-        const wxWxCharBuffer buf = wxGTK_CONV_BACK(text);
-        if ( buf )
-            tmp = buf;
+        return wxGTK_CONV_BACK(text);
     }
     else
     {
         const gchar *text = gtk_entry_get_text( GTK_ENTRY(m_text) );
-        const wxWxCharBuffer buf = wxGTK_CONV_BACK( text );
-        if ( buf )
-            tmp = buf;
+        return wxGTK_CONV_BACK(text);
     }
 
     return tmp;
@@ -1297,14 +1293,7 @@ bool wxTextCtrl::Enable( bool enable )
         return false;
     }
 
-    if ( IsMultiLine() )
-    {
-        SetEditable( enable );
-    }
-    else
-    {
-        gtk_widget_set_sensitive( m_text, enable );
-    }
+    gtk_widget_set_sensitive( m_text, enable );
 
     return true;
 }