implemented wxMBConv::IsUTF8() helper for more classes so that all uses of UTF-8...

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 558d9064e56f9e0c8fb1c281d66f8f43955aa2ec..03d093667cb775336b593a3052f5f998c8487373 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -51,6 +51,24 @@ static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
 }
 }
 
 }
 }
 

+// remove all tags starting with the given prefix from the start..end range
+static void
+wxGtkTextRemoveTagsWithPrefix(GtkTextBuffer *text_buffer,
+                              const char *prefix,
+                              GtkTextIter *start,
+                              GtkTextIter *end)
+{
+    gulong remove_handler_id = g_signal_connect
+                               (
+                                text_buffer,
+                                "remove_tag",
+                                G_CALLBACK(wxGtkOnRemoveTag),
+                                gpointer(prefix)
+                               );
+    gtk_text_buffer_remove_all_tags(text_buffer, start, end);
+    g_signal_handler_disconnect(text_buffer, remove_handler_id);
+}
+

 static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
                                        GtkTextBuffer *text_buffer,
                                        const wxTextAttr& attr,
 static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
                                        GtkTextBuffer *text_buffer,
                                        const wxTextAttr& attr,


@@ -60,13 +78,10 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
     static gchar buf[1024];
     GtkTextTag *tag;
 
     static gchar buf[1024];
     GtkTextTag *tag;
 

-    gulong remove_handler_id = g_signal_connect (text_buffer, "remove_tag",
-            G_CALLBACK (wxGtkOnRemoveTag), gpointer("WX"));
-    gtk_text_buffer_remove_all_tags(text_buffer, start, end);
-    g_signal_handler_disconnect (text_buffer, remove_handler_id);
-

     if (attr.HasFont())
     {
     if (attr.HasFont())
     {

+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFONT", start, end);
+

         PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description;
         wxGtkString font_string(pango_font_description_to_string(font_description));
         g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string.c_str());
         PangoFontDescription *font_description = attr.GetFont().GetNativeFontInfo()->description;
         wxGtkString font_string(pango_font_description_to_string(font_description));
         g_snprintf(buf, sizeof(buf), "WXFONT %s", font_string.c_str());


@@ -94,6 +109,8 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
 
     if (attr.HasTextColour())
     {
 
     if (attr.HasTextColour())
     {

+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXFORECOLOR", start, end);
+

         const GdkColor *colFg = attr.GetTextColour().GetColor();
         g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d",
                    colFg->red, colFg->green, colFg->blue);
         const GdkColor *colFg = attr.GetTextColour().GetColor();
         g_snprintf(buf, sizeof(buf), "WXFORECOLOR %d %d %d",
                    colFg->red, colFg->green, colFg->blue);


@@ -107,6 +124,8 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
 
     if (attr.HasBackgroundColour())
     {
 
     if (attr.HasBackgroundColour())
     {

+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXBACKCOLOR", start, end);
+

         const GdkColor *colBg = attr.GetBackgroundColour().GetColor();
         g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d",
                    colBg->red, colBg->green, colBg->blue);
         const GdkColor *colBg = attr.GetBackgroundColour().GetColor();
         g_snprintf(buf, sizeof(buf), "WXBACKCOLOR %d %d %d",
                    colBg->red, colBg->green, colBg->blue);


@@ -126,11 +145,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
                                           gtk_text_iter_get_line(start) );
         gtk_text_iter_forward_line(&para_end);
 
                                           gtk_text_iter_get_line(start) );
         gtk_text_iter_forward_line(&para_end);
 

-        remove_handler_id = g_signal_connect (text_buffer, "remove_tag",
-                                              G_CALLBACK(wxGtkOnRemoveTag),
-                                              gpointer("WXALIGNMENT"));
-        gtk_text_buffer_remove_all_tags( text_buffer, &para_start, &para_end );
-        g_signal_handler_disconnect (text_buffer, remove_handler_id);
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXALIGNMENT", start, end);

 
         GtkJustification align;
         switch (attr.GetAlignment())
 
         GtkJustification align;
         switch (attr.GetAlignment())


@@ -144,7 +159,16 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
             case wxTEXT_ALIGNMENT_CENTER:
                 align = GTK_JUSTIFY_CENTER;
                 break;
             case wxTEXT_ALIGNMENT_CENTER:
                 align = GTK_JUSTIFY_CENTER;
                 break;

-            // gtk+ doesn't support justify as of gtk+-2.7.4
+// 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:
+                if (!gtk_check_version(2,11,0))
+                    align = GTK_JUSTIFY_FILL;
+                else
+                    align = GTK_JUSTIFY_LEFT;
+                break;
+#endif

         }
 
         g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);
         }
 
         g_snprintf(buf, sizeof(buf), "WXALIGNMENT %d", align);


@@ -167,11 +191,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
                                           gtk_text_iter_get_line(start) );
         gtk_text_iter_forward_line(&para_end);
 
                                           gtk_text_iter_get_line(start) );
         gtk_text_iter_forward_line(&para_end);
 

-        remove_handler_id = g_signal_connect (text_buffer, "remove_tag",
-                                              G_CALLBACK(wxGtkOnRemoveTag),
-                                              gpointer("WXINDENT"));
-        gtk_text_buffer_remove_all_tags( text_buffer, &para_start, &para_end );
-        g_signal_handler_disconnect (text_buffer, remove_handler_id);
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXINDENT", start, end);

 
         // Convert indent from 1/10th of a mm into pixels
         float factor;
 
         // Convert indent from 1/10th of a mm into pixels
         float factor;


@@ -220,11 +240,7 @@ static void wxGtkTextApplyTagsFromAttr(GtkWidget *text,
                                           gtk_text_iter_get_line(start) );
         gtk_text_iter_forward_line(&para_end);
 
                                           gtk_text_iter_get_line(start) );
         gtk_text_iter_forward_line(&para_end);
 

-        remove_handler_id = g_signal_connect (text_buffer, "remove_tag",
-                                              G_CALLBACK(wxGtkOnRemoveTag),
-                                              gpointer("WXTABS"));
-        gtk_text_buffer_remove_all_tags( text_buffer, &para_start, &para_end );
-        g_signal_handler_disconnect (text_buffer, remove_handler_id);
+        wxGtkTextRemoveTagsWithPrefix(text_buffer, "WXTABS", start, end);

 
         const wxArrayInt& tabs = attr.GetTabs();
 
 
         const wxArrayInt& tabs = attr.GetTabs();
 


@@ -291,9 +307,6 @@ gtk_insert_text_callback(GtkEditable *editable,
                          gint *position,
                          wxTextCtrl *win)
 {
                          gint *position,
                          wxTextCtrl *win)
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     // 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);
 


@@ -540,9 +553,6 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
 
     if (!win->m_hasVMT) return;
 
 
     if (!win->m_hasVMT) return;
 

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     if ( win->MarkDirtyOnChange() )
         win->MarkDirty();
 
     if ( win->MarkDirtyOnChange() )
         win->MarkDirty();
 


@@ -684,9 +694,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
                          const wxValidator& validator,
                          const wxString &name )
 {
                          const wxValidator& validator,
                          const wxString &name )
 {

-    m_needParent = true;
-    m_acceptsFocus = true;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {


@@ -711,7 +718,10 @@ bool wxTextCtrl::Create( wxWindow *parent,
         // create scrolled window
         m_widget = gtk_scrolled_window_new( NULL, NULL );
         gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ),
         // create scrolled window
         m_widget = gtk_scrolled_window_new( NULL, NULL );
         gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ),

-                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
+                                        GTK_POLICY_AUTOMATIC,
+                                        style & wxTE_NO_VSCROLL
+                                            ? GTK_POLICY_NEVER
+                                            : GTK_POLICY_AUTOMATIC );

         // for ScrollLines/Pages
         m_scrollBar[1] = (GtkRange*)((GtkScrolledWindow*)m_widget)->vscrollbar;
 
         // for ScrollLines/Pages
         m_scrollBar[1] = (GtkRange*)((GtkScrolledWindow*)m_widget)->vscrollbar;
 


@@ -819,9 +829,6 @@ bool wxTextCtrl::Create( wxWindow *parent,
 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 
 
     m_cursor = wxCursor( wxCURSOR_IBEAM );
 

-    wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
-    SetDefaultStyle( attrDef );
-

     return true;
 }
 
     return true;
 }
 


@@ -948,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));
 
         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) );
     }
     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;
     }
 
     return tmp;


@@ -1000,7 +1003,13 @@ void wxTextCtrl::DoSetValue( const wxString &value, int flags )
     m_modified = false;
     DontMarkDirtyOnNextChange();
 
     m_modified = false;
     DontMarkDirtyOnNextChange();
 

-    const wxCharBuffer buffer(wxGTK_CONV_ENC(value, GetTextEncoding()));
+    wxFontEncoding enc = m_defaultStyle.HasFont()
+                            ? m_defaultStyle.GetFont().GetEncoding()
+                            : wxFONTENCODING_SYSTEM;
+    if ( enc == wxFONTENCODING_SYSTEM )
+        enc = GetTextEncoding();
+
+    const wxCharBuffer buffer(wxGTK_CONV_ENC(value, enc));

     if ( !buffer )
     {
         // see comment in WriteText() as to why we must warn the user about
     if ( !buffer )
     {
         // see comment in WriteText() as to why we must warn the user about


@@ -1021,6 +1030,14 @@ void wxTextCtrl::DoSetValue( const wxString &value, int flags )
     if ( IsMultiLine() )
     {
         gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
     if ( IsMultiLine() )
     {
         gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );

+
+        if ( !m_defaultStyle.IsDefault() )
+        {
+            GtkTextIter start, end;
+            gtk_text_buffer_get_bounds( m_buffer, &start, &end );
+            wxGtkTextApplyTagsFromAttr(m_widget, m_buffer, m_defaultStyle,
+                                       &start, &end);
+        }

     }
     else // single line
     {
     }
     else // single line
     {


@@ -1119,8 +1136,12 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
     {
         GtkTextIter line;
         gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);
     {
         GtkTextIter line;
         gtk_text_buffer_get_iter_at_line(m_buffer,&line,lineNo);

+

         GtkTextIter end = line;
         GtkTextIter end = line;

-        gtk_text_iter_forward_to_line_end(&end);
+        // avoid skipping to the next line end if this one is empty
+        if ( !gtk_text_iter_ends_line(&line) )
+            gtk_text_iter_forward_to_line_end(&end);
+

         wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true));
         result = wxGTK_CONV_BACK(text);
     }
         wxGtkString text(gtk_text_buffer_get_text(m_buffer, &line, &end, true));
         result = wxGTK_CONV_BACK(text);
     }


@@ -1285,9 +1306,9 @@ bool wxTextCtrl::Enable( bool enable )
 }
 
 // wxGTK-specific: called recursively by Enable,
 }
 
 // wxGTK-specific: called recursively by Enable,

-// to give widgets an oppprtunity to correct their colours after they
+// to give widgets an opportunity to correct their colours after they

 // have been changed by Enable
 // have been changed by Enable

-void wxTextCtrl::OnParentEnable( bool enable )
+void wxTextCtrl::OnEnabled( bool enable )

 {
     // If we have a custom background colour, we use this colour in both
     // disabled and enabled mode, or we end up with a different colour under the
 {
     // If we have a custom background colour, we use this colour in both
     // disabled and enabled mode, or we end up with a different colour under the


@@ -1785,18 +1806,12 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start );
         gtk_text_buffer_get_iter_at_offset( m_buffer, &endi, end );
 
         gtk_text_buffer_get_iter_at_offset( m_buffer, &starti, start );
         gtk_text_buffer_get_iter_at_offset( m_buffer, &endi, end );
 

-        // use the attributes from style which are set in it and fall back
-        // first to the default style and then to the text control default
-        // colours for the others
-        wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
-
-        wxGtkTextApplyTagsFromAttr( m_widget, m_buffer, attr, &starti, &endi );
+        wxGtkTextApplyTagsFromAttr( m_widget, m_buffer, style, &starti, &endi );

 
         return true;
     }
 
         return true;
     }

+    //else: single line text controls don't support styles

 
 

-    // else single line
-    // cannot do this for GTK+'s Entry widget

     return false;
 }
 
     return false;
 }