Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 3cd7d06b2ce8773f1b909b3276d45e753161e2d8..e8525301078558339a6bbefaf2106f0f1511afb3 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -42,7 +42,6 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
 // data
 //-----------------------------------------------------------------------------
 

-extern bool       g_blockEventsOnDrag;

 extern wxCursor   g_globalCursor;
 extern wxWindowGTK *g_delayedFocus;
 
 extern wxCursor   g_globalCursor;
 extern wxWindowGTK *g_delayedFocus;
 


@@ -51,6 +50,24 @@ extern wxWindowGTK *g_delayedFocus;
 // ----------------------------------------------------------------------------
 
 #ifdef __WXGTK20__
 // ----------------------------------------------------------------------------
 
 #ifdef __WXGTK20__

+extern "C" {
+static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
+                             GtkTextTag *tag,
+                             GtkTextIter *start,
+                             GtkTextIter *end,
+                             gpointer user_data)
+{
+    gchar *name;
+    g_object_get (tag, "name", &name, NULL);
+
+    if (!name || strncmp(name, "WX", 2)) // anonymous tag or not starting with "WX"
+        g_signal_stop_emission_by_name(buffer, "remove_tag");
+
+    g_free(name);
+}
+}
+
+extern "C" {

 static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
                                        const wxTextAttr& attr,
                                        GtkTextIter *start,
 static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
                                        const wxTextAttr& attr,
                                        GtkTextIter *start,


@@ -59,6 +76,11 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
     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), NULL);
+    gtk_text_buffer_remove_all_tags(text_buffer, start, end);
+    g_signal_handler_disconnect( text_buffer, remove_handler_id );
+

     if (attr.HasFont())
     {
         char *font_string;
     if (attr.HasFont())
     {
         char *font_string;


@@ -101,7 +123,9 @@ static void wxGtkTextApplyTagsFromAttr(GtkTextBuffer *text_buffer,
         gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
     }
 }
         gtk_text_buffer_apply_tag (text_buffer, tag, start, end);
     }
 }

+}

 
 

+extern "C" {

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


@@ -120,7 +144,9 @@ static void wxGtkTextInsert(GtkWidget *text,
 
     wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter);
 }
 
     wxGtkTextApplyTagsFromAttr(text_buffer, attr, &start, &iter);
 }

+}

 #else
 #else

+extern "C" {

 static void wxGtkTextInsert(GtkWidget *text,
                             const wxTextAttr& attr,
                             const char *txt,
 static void wxGtkTextInsert(GtkWidget *text,
                             const wxTextAttr& attr,
                             const char *txt,


@@ -138,12 +164,14 @@ static void wxGtkTextInsert(GtkWidget *text,
 
     gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
 }
 
     gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
 }

+}

 #endif // GTK 1.x
 
 // ----------------------------------------------------------------------------
 // "insert_text" for GtkEntry
 // ----------------------------------------------------------------------------
 
 #endif // GTK 1.x
 
 // ----------------------------------------------------------------------------
 // "insert_text" for GtkEntry
 // ----------------------------------------------------------------------------
 

+extern "C" {

 static void
 gtk_insert_text_callback(GtkEditable *editable,
                          const gchar *new_text,
 static void
 gtk_insert_text_callback(GtkEditable *editable,
                          const gchar *new_text,


@@ -179,10 +207,12 @@ gtk_insert_text_callback(GtkEditable *editable,
         win->GetEventHandler()->ProcessEvent( event );
     }
 }
         win->GetEventHandler()->ProcessEvent( event );
     }
 }

+}

 
 #ifdef __WXGTK20__
 // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp,
 
 
 #ifdef __WXGTK20__
 // Implementation of wxTE_AUTO_URL for wxGTK2 by Mart Raudsepp,
 

+extern "C" {

 static void
 au_apply_tag_callback(GtkTextBuffer *buffer,
                       GtkTextTag *tag,
 static void
 au_apply_tag_callback(GtkTextBuffer *buffer,
                       GtkTextTag *tag,


@@ -193,34 +223,43 @@ au_apply_tag_callback(GtkTextBuffer *buffer,
     if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"))
         g_signal_stop_emission_by_name(buffer, "apply_tag");
 }
     if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"))
         g_signal_stop_emission_by_name(buffer, "apply_tag");
 }

+}

 
 //-----------------------------------------------------------------------------
 //  GtkTextCharPredicates for gtk_text_iter_*_find_char
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 //  GtkTextCharPredicates for gtk_text_iter_*_find_char
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gboolean
 pred_whitespace (gunichar ch, gpointer user_data)
 {
     return g_unichar_isspace(ch);
 }
 static gboolean
 pred_whitespace (gunichar ch, gpointer user_data)
 {
     return g_unichar_isspace(ch);
 }

+}

 
 

+extern "C" {

 static gboolean
 pred_non_whitespace (gunichar ch, gpointer user_data)
 {
     return !g_unichar_isspace(ch);
 }
 static gboolean
 pred_non_whitespace (gunichar ch, gpointer user_data)
 {
     return !g_unichar_isspace(ch);
 }

+}

 
 

+extern "C" {

 static gboolean
 pred_nonpunct (gunichar ch, gpointer user_data)
 {
     return !g_unichar_ispunct(ch);
 }
 static gboolean
 pred_nonpunct (gunichar ch, gpointer user_data)
 {
     return !g_unichar_ispunct(ch);
 }

+}

 
 

+extern "C" {

 static gboolean
 pred_nonpunct_or_slash (gunichar ch, gpointer user_data)
 {
     return !g_unichar_ispunct(ch) || ch == '/';
 }
 static gboolean
 pred_nonpunct_or_slash (gunichar ch, gpointer user_data)
 {
     return !g_unichar_ispunct(ch) || ch == '/';
 }

+}

 
 //-----------------------------------------------------------------------------
 //  Check for links between s and e and correct tags as necessary
 
 //-----------------------------------------------------------------------------
 //  Check for links between s and e and correct tags as necessary


@@ -228,6 +267,7 @@ pred_nonpunct_or_slash (gunichar ch, gpointer user_data)
 
 // This function should be made match better while being efficient at one point.
 // Most probably with a row of regular expressions.
 
 // This function should be made match better while being efficient at one point.
 // Most probably with a row of regular expressions.

+extern "C" {

 static void
 au_check_word( GtkTextIter *s, GtkTextIter *e )
 {
 static void
 au_check_word( GtkTextIter *s, GtkTextIter *e )
 {


@@ -251,7 +291,7 @@ au_check_word( GtkTextIter *s, GtkTextIter *e )
 
     GtkTextIter start = *s, end = *e;
     GtkTextBuffer *buffer = gtk_text_iter_get_buffer(s);
 
     GtkTextIter start = *s, end = *e;
     GtkTextBuffer *buffer = gtk_text_iter_get_buffer(s);

-    
+

     // Get our special link tag
     GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl");
 
     // Get our special link tag
     GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl");
 


@@ -287,7 +327,9 @@ au_check_word( GtkTextIter *s, GtkTextIter *e )
         g_signal_handler_unblock(buffer, signal_id);
     }
 }
         g_signal_handler_unblock(buffer, signal_id);
     }
 }

+}

 
 

+extern "C" {

 static void
 au_check_range(GtkTextIter *s,
                GtkTextIter *range_end)
 static void
 au_check_range(GtkTextIter *s,
                GtkTextIter *range_end)


@@ -314,11 +356,13 @@ au_check_range(GtkTextIter *s,
         gtk_text_iter_forward_find_char(&range_start, pred_non_whitespace, NULL, range_end);
     }
 }
         gtk_text_iter_forward_find_char(&range_start, pred_non_whitespace, NULL, range_end);
     }
 }

+}

 
 //-----------------------------------------------------------------------------
 //  "insert-text" for GtkTextBuffer
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 //  "insert-text" for GtkTextBuffer
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void
 au_insert_text_callback(GtkTextBuffer *buffer,
                         GtkTextIter *end,
 static void
 au_insert_text_callback(GtkTextBuffer *buffer,
                         GtkTextIter *end,


@@ -344,11 +388,13 @@ au_insert_text_callback(GtkTextBuffer *buffer,
 
     au_check_range(&words_start, &words_end);
 }
 
     au_check_range(&words_start, &words_end);
 }

+}

 
 //-----------------------------------------------------------------------------
 //  "delete-range" for GtkTextBuffer
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 //  "delete-range" for GtkTextBuffer
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void
 au_delete_range_callback(GtkTextBuffer *buffer,
                          GtkTextIter *start,
 static void
 au_delete_range_callback(GtkTextBuffer *buffer,
                          GtkTextIter *start,


@@ -367,6 +413,7 @@ au_delete_range_callback(GtkTextBuffer *buffer,
 
     au_check_range(start, end);
 }
 
     au_check_range(start, end);
 }

+}

 
 
 #endif
 
 
 #endif


@@ -375,6 +422,7 @@ au_delete_range_callback(GtkTextBuffer *buffer,
 //  "changed"
 //-----------------------------------------------------------------------------
 
 //  "changed"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static void
 gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
 {
 static void
 gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
 {


@@ -395,17 +443,20 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
 }
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
 }

+}

 
 //-----------------------------------------------------------------------------
 // "expose_event" from scrolled window and textview
 //-----------------------------------------------------------------------------
 
 #ifdef __WXGTK20__
 
 //-----------------------------------------------------------------------------
 // "expose_event" from scrolled window and textview
 //-----------------------------------------------------------------------------
 
 #ifdef __WXGTK20__

+extern "C" {

 static gboolean
 gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win )
 {
     return TRUE;
 }
 static gboolean
 gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win )
 {
     return TRUE;
 }

+}

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -413,6 +464,7 @@ gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl
 //-----------------------------------------------------------------------------
 
 #ifndef __WXGTK20__
 //-----------------------------------------------------------------------------
 
 #ifndef __WXGTK20__

+extern "C" {

 static void
 gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
 static void
 gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {


@@ -423,6 +475,7 @@ gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 
     win->CalculateScrollbar();
 }
 
     win->CalculateScrollbar();
 }

+}

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -444,8 +497,8 @@ extern "C" {
 
 static GtkDrawCallback gs_gtk_text_draw = NULL;
 
 
 static GtkDrawCallback gs_gtk_text_draw = NULL;
 

-extern "C"
-void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
+extern "C" {
+static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)

 {
     if ( !wxIsInsideYield )
     {
 {
     if ( !wxIsInsideYield )
     {


@@ -455,6 +508,7 @@ void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
         gs_gtk_text_draw(widget, rect);
     }
 }
         gs_gtk_text_draw(widget, rect);
     }
 }

+}

 
 #endif // __WXGTK20__
 
 
 #endif // __WXGTK20__
 


@@ -570,11 +624,28 @@ bool wxTextCtrl::Create( wxWindow *parent,
         // Insert view into scrolled window
         gtk_container_add( GTK_CONTAINER(m_widget), m_text );
 
         // Insert view into scrolled window
         gtk_container_add( GTK_CONTAINER(m_widget), m_text );
 

-        // Global settings which can be overridden by tags, I guess.
-        if (HasFlag( wxHSCROLL ) || HasFlag( wxTE_DONTWRAP ))
-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE );
-        else
-            gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD );
+        // translate wx wrapping style to GTK+
+        GtkWrapMode wrap;
+        if ( HasFlag( wxTE_DONTWRAP ) )
+            wrap = GTK_WRAP_NONE;
+        else if ( HasFlag( wxTE_CHARWRAP ) )
+            wrap = GTK_WRAP_CHAR;
+        else if ( HasFlag( wxTE_WORDWRAP ) )
+            wrap = GTK_WRAP_WORD;
+        else // HasFlag(wxTE_BESTWRAP) always true as wxTE_BESTWRAP == 0
+        {
+            // GTK_WRAP_WORD_CHAR seems to be new in GTK+ 2.4
+#ifdef __WXGTK24__
+            if ( !gtk_check_version(2,4,0) )
+            {
+                wrap = GTK_WRAP_WORD_CHAR;
+            }
+            else
+#endif
+            wrap = GTK_WRAP_WORD;
+        }
+
+        gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), wrap );

 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
 
         if (!HasFlag(wxNO_BORDER))
             gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );


@@ -582,7 +653,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
         gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
 
         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
         gtk_widget_add_events( GTK_WIDGET(m_text), GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK );
 
         GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );

-#else
+#else // GTK+ 1

         // create our control ...
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 
         // create our control ...
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 


@@ -605,7 +676,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
                      GTK_FILL,
                      (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
                      0, 0);
                      GTK_FILL,
                      (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
                      0, 0);

-#endif
+#endif // GTK+ 2/1

     }
     else
     {
     }
     else
     {


@@ -811,7 +882,7 @@ void wxTextCtrl::CalculateScrollbar()
 
 wxString wxTextCtrl::GetValue() const
 {
 
 wxString wxTextCtrl::GetValue() const
 {

-    wxCHECK_MSG( m_text != NULL, wxT(""), wxT("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );

 
     wxString tmp;
     if (m_windowStyle & wxTE_MULTILINE)
 
     wxString tmp;
     if (m_windowStyle & wxTE_MULTILINE)


@@ -863,6 +934,12 @@ void wxTextCtrl::SetValue( const wxString &value )
         if (gtk_text_buffer_get_char_count(m_buffer) != 0)
             IgnoreNextTextUpdate();
 
         if (gtk_text_buffer_get_char_count(m_buffer) != 0)
             IgnoreNextTextUpdate();
 

+        if ( !buffer )
+        {
+            // what else can we do? at least don't crash...
+            return;
+        }
+

         gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
 
 #else
         gtk_text_buffer_set_text( m_buffer, buffer, strlen(buffer) );
 
 #else


@@ -958,6 +1035,12 @@ void wxTextCtrl::WriteText( const wxString &text )
 #else
         wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
 #endif
 #else
         wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
 #endif

+        if ( !buffer )
+        {
+            // what else can we do? at least don't crash...
+            return;
+        }
+

         gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
 
 #else
         gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
 
 #else


@@ -987,7 +1070,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
 
         if (text)
         {
 
         if (text)
         {

-            wxString buf(wxT(""));
+            wxString buf;

             long i;
             int currentLine = 0;
             for (i = 0; currentLine != lineNo && text[i]; i++ )
             long i;
             int currentLine = 0;
             for (i = 0; currentLine != lineNo && text[i]; i++ )


@@ -1641,7 +1724,7 @@ bool wxTextCtrl::IsModified() const
 
 void wxTextCtrl::Clear()
 {
 
 void wxTextCtrl::Clear()
 {

-    SetValue( wxT("") );
+    SetValue( wxEmptyString );

 }
 
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 }
 
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )


@@ -1812,6 +1895,7 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
             // nothing to do
             return true;
         }
             // nothing to do
             return true;
         }

+

 #ifdef __WXGTK20__
         gint l = gtk_text_buffer_get_char_count( m_buffer );
 
 #ifdef __WXGTK20__
         gint l = gtk_text_buffer_get_char_count( m_buffer );
 


@@ -1828,8 +1912,6 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
 
         wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi );
         wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
 
         wxGtkTextApplyTagsFromAttr( m_buffer, attr, &starti, &endi );

-
-        return true;

 #else
         // VERY dirty way to do that - removes the required text and re-adds it
         // with styling (FIXME)
 #else
         // VERY dirty way to do that - removes the required text and re-adds it
         // with styling (FIXME)


@@ -1847,14 +1929,14 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end );
         gtk_editable_set_position( GTK_EDITABLE(m_text), start );
 
         gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end );
         gtk_editable_set_position( GTK_EDITABLE(m_text), start );
 

-#if wxUSE_UNICODE
+    #if wxUSE_UNICODE

         wxWX2MBbuf buf = tmp.mbc_str();
         const char *txt = buf;
         size_t txtlen = strlen(buf);
         wxWX2MBbuf buf = tmp.mbc_str();
         const char *txt = buf;
         size_t txtlen = strlen(buf);

-#else
+    #else

         const char *txt = tmp;
         size_t txtlen = tmp.length();
         const char *txt = tmp;
         size_t txtlen = tmp.length();

-#endif
+    #endif

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


@@ -1868,13 +1950,13 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
         SetInsertionPoint( old_pos );
 #endif
         gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
         SetInsertionPoint( old_pos );
 #endif

+

         return true;
     }
         return true;
     }

-    else // singe line
-    {
-        // cannot do this for GTK+'s Entry widget
-        return false;
-    }
+
+    // else single line
+    // cannot do this for GTK+'s Entry widget
+    return false;

 }
 
 void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
 }
 
 void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)