update from Tsolakos Stavros

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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 1a9ae3ca2d7d9e55b9f87afb6d2869ea27c2a004..5d4025de68c029d4b23baa4c56278e78b32405f5 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -155,7 +155,9 @@ gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
         wxapp_install_idle_handler();
 
     win->SetModified();
         wxapp_install_idle_handler();
 
     win->SetModified();

+#ifndef __WXGTK20__

     win->UpdateFontIfNeeded();
     win->UpdateFontIfNeeded();

+#endif // !__WXGTK20__

 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
     event.SetEventObject( win );


@@ -239,7 +241,7 @@ void wxTextCtrl::Init()
 {
     m_ignoreNextUpdate =
     m_modified = FALSE;
 {
     m_ignoreNextUpdate =
     m_modified = FALSE;

-    m_updateFont = FALSE;
+    SetUpdateFont(FALSE);

     m_text =
     m_vScrollbar = (GtkWidget *)NULL;
 }
     m_text =
     m_vScrollbar = (GtkWidget *)NULL;
 }


@@ -516,7 +518,8 @@ wxString wxTextCtrl::GetValue() const
 #else
         wxCharBuffer buffer( wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC( text ) ) );
 #endif
 #else
         wxCharBuffer buffer( wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC( text ) ) );
 #endif

-        tmp = buffer;
+        if ( buffer )
+            tmp = buffer;

 
         g_free( text );
 #else
 
         g_free( text );
 #else


@@ -577,6 +580,11 @@ void wxTextCtrl::WriteText( const wxString &text )
     if ( text.empty() )
         return;
 
     if ( text.empty() )
         return;
 

+    // gtk_text_changed_callback() will set m_modified to true but m_modified
+    // shouldn't be changed by the program writing to the text control itself,
+    // so save the old value and restore when we're done
+    bool oldModified = m_modified;
+

     if ( m_windowStyle & wxTE_MULTILINE )
     {
 #ifdef __WXGTK20__
     if ( m_windowStyle & wxTE_MULTILINE )
     {
 #ifdef __WXGTK20__


@@ -586,6 +594,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;
+        }
+

         GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
 
         // TODO: Call whatever is needed to delete the selection.
         GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
 
         // TODO: Call whatever is needed to delete the selection.


@@ -612,7 +626,7 @@ void wxTextCtrl::WriteText( const wxString &text )
         // in UpdateFontIfNeeded() any longer
         if ( !text.empty() )
         {
         // in UpdateFontIfNeeded() any longer
         if ( !text.empty() )
         {

-            m_updateFont = FALSE;
+            SetUpdateFont(FALSE);

         }
 
         // Bring editable's cursor back uptodate.
         }
 
         // Bring editable's cursor back uptodate.


@@ -644,7 +658,7 @@ void wxTextCtrl::WriteText( const wxString &text )
         gtk_entry_set_position( GTK_ENTRY(m_text), len );
     }
 
         gtk_entry_set_position( GTK_ENTRY(m_text), len );
     }
 

-    m_modified = TRUE;
+    m_modified = oldModified;

 }
 
 void wxTextCtrl::AppendText( const wxString &text )
 }
 
 void wxTextCtrl::AppendText( const wxString &text )


@@ -808,14 +822,19 @@ void wxTextCtrl::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-    if (m_windowStyle & wxTE_MULTILINE)
+    if ( IsMultiLine() )

     {
 #ifdef __WXGTK20__
         GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
         GtkTextIter iter;
         gtk_text_buffer_get_iter_at_offset( text_buffer, &iter, pos );
         gtk_text_buffer_place_cursor( text_buffer, &iter );
     {
 #ifdef __WXGTK20__
         GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
         GtkTextIter iter;
         gtk_text_buffer_get_iter_at_offset( text_buffer, &iter, pos );
         gtk_text_buffer_place_cursor( text_buffer, &iter );

-#else
+        gtk_text_view_scroll_mark_onscreen
+        (
+            GTK_TEXT_VIEW(m_text),
+            gtk_text_buffer_get_insert( text_buffer )
+        );
+#else // GTK+ 1.x

         gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
           GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 
         gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
           GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
 


@@ -832,7 +851,7 @@ void wxTextCtrl::SetInsertionPoint( long pos )
 
         // bring editable's cursor uptodate. Bug in GTK.
         SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
 
         // bring editable's cursor uptodate. Bug in GTK.
         SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));

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

     }
     else
     {
     }
     else
     {


@@ -1057,6 +1076,36 @@ void wxTextCtrl::ShowPosition( long pos )
     }
 }
 
     }
 }
 

+#ifdef __WXGTK20__
+
+wxTextCtrlHitTestResult
+wxTextCtrl::HitTest(const wxPoint& pt, long *pos) const
+{
+    if ( !IsMultiLine() )
+    {
+        // not supported
+        return wxTE_HT_UNKNOWN;
+    }
+
+    int x, y;
+    gtk_text_view_window_to_buffer_coords
+    (
+        GTK_TEXT_VIEW(m_text),
+        GTK_TEXT_WINDOW_TEXT,
+        pt.x, pt.y,
+        &x, &y
+    );
+
+    GtkTextIter iter;
+    gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(m_text), &iter, x, y);
+    if ( pos )
+        *pos = gtk_text_iter_get_offset(&iter);
+
+    return wxTE_HT_ON_TEXT;
+}
+
+#endif // __WXGTK20__
+

 long wxTextCtrl::GetInsertionPoint() const
 {
     wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
 long wxTextCtrl::GetInsertionPoint() const
 {
     wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );


@@ -1157,27 +1206,36 @@ void wxTextCtrl::Cut()
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-#ifndef __WXGTK20__
-    gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
+#ifdef __WXGTK20__
+    if (m_windowStyle & wxTE_MULTILINE)
+        g_signal_emit_by_name(m_text, "cut-clipboard");
+    else

 #endif
 #endif

+        gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);

 }
 
 void wxTextCtrl::Copy()
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 }
 
 void wxTextCtrl::Copy()
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-#ifndef __WXGTK20__
-    gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
+#ifdef __WXGTK20__
+    if (m_windowStyle & wxTE_MULTILINE)
+        g_signal_emit_by_name(m_text, "copy-clipboard");
+    else

 #endif
 #endif

+        gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);

 }
 
 void wxTextCtrl::Paste()
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 
 }
 
 void wxTextCtrl::Paste()
 {
     wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
 

-#ifndef __WXGTK20__
-    gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
+#ifdef __WXGTK20__
+    if (m_windowStyle & wxTE_MULTILINE)
+        g_signal_emit_by_name(m_text, "paste-clipboard");
+    else

 #endif
 #endif

+        gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);

 }
 
 // Undo/redo
 }
 
 // Undo/redo


@@ -1362,7 +1420,7 @@ bool wxTextCtrl::SetFont( const wxFont &font )
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {
 
     if ( m_windowStyle & wxTE_MULTILINE )
     {

-        m_updateFont = TRUE;
+        SetUpdateFont(TRUE);

 
         m_defaultStyle.SetFont(font);
 
 
         m_defaultStyle.SetFont(font);
 


@@ -1376,25 +1434,37 @@ void wxTextCtrl::ChangeFontGlobally()
 {
     // this method is very inefficient and hence should be called as rarely as
     // possible!
 {
     // this method is very inefficient and hence should be called as rarely as
     // possible!

+    //
+    // TODO: it can be implemented much more efficiently for GTK2
+#ifndef __WXGTK20__

     wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
     wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,

+
+                  _T("shouldn't be called for single line controls") );
+#else
+    wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE),

                   _T("shouldn't be called for single line controls") );
                   _T("shouldn't be called for single line controls") );

+#endif

 
     wxString value = GetValue();
     if ( !value.IsEmpty() )
     {
 
     wxString value = GetValue();
     if ( !value.IsEmpty() )
     {

-        m_updateFont = FALSE;
+        SetUpdateFont(FALSE);

 
         Clear();
         AppendText(value);
     }
 }
 
 
         Clear();
         AppendText(value);
     }
 }
 

+#ifndef __WXGTK20__
+

 void wxTextCtrl::UpdateFontIfNeeded()
 {
     if ( m_updateFont )
         ChangeFontGlobally();
 }
 
 void wxTextCtrl::UpdateFontIfNeeded()
 {
     if ( m_updateFont )
         ChangeFontGlobally();
 }
 

+#endif // GTK+ 1.x
+

 bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
 {
     if ( !wxControl::SetForegroundColour(colour) )
 bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
 {
     if ( !wxControl::SetForegroundColour(colour) )


@@ -1413,8 +1483,10 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
     if ( !wxControl::SetBackgroundColour( colour ) )
         return FALSE;
 
     if ( !wxControl::SetBackgroundColour( colour ) )
         return FALSE;
 

+#ifndef __WXGTK20__

     if (!m_widget->window)
         return FALSE;
     if (!m_widget->window)
         return FALSE;

+#endif

 
     if (!m_backgroundColour.Ok())
         return FALSE;
 
     if (!m_backgroundColour.Ok())
         return FALSE;


@@ -1662,16 +1734,18 @@ void wxTextCtrl::Thaw()
 
 GtkAdjustment *wxTextCtrl::GetVAdj() const
 {
 
 GtkAdjustment *wxTextCtrl::GetVAdj() const
 {

+    if ( !IsMultiLine() )
+        return NULL;
+

 #ifdef __WXGTK20__
 #ifdef __WXGTK20__

-    return NULL;
+    return gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(m_widget));

 #else
 #else

-    return HasFlag(wxTE_MULTILINE) ? GTK_TEXT(m_text)->vadj : NULL;
+    return GTK_TEXT(m_text)->vadj;

 #endif
 }
 
 bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
 {
 #endif
 }
 
 bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
 {

-#ifndef __WXGTK20__

     float value = adj->value + diff;
 
     if ( value < 0 )
     float value = adj->value + diff;
 
     if ( value < 0 )


@@ -1690,39 +1764,38 @@ bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
 
     adj->value = value;
 
 
     adj->value = value;
 

+#ifdef __WXGTK20__
+    gtk_adjustment_value_changed(GTK_ADJUSTMENT(adj));
+#else

     gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");
     gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");

-

 #endif
 #endif

+

     return TRUE;
 }
 
 bool wxTextCtrl::ScrollLines(int lines)
 {
     return TRUE;
 }
 
 bool wxTextCtrl::ScrollLines(int lines)
 {

-#ifdef __WXGTK20__
-    return FALSE;
-#else

     GtkAdjustment *adj = GetVAdj();
     if ( !adj )
         return FALSE;
 
     GtkAdjustment *adj = GetVAdj();
     if ( !adj )
         return FALSE;
 

+#ifdef __WXGTK20__
+    int diff = (int)ceil(lines*adj->step_increment);
+#else

     // this is hardcoded to 10 in GTK+ 1.2 (great idea)
     // this is hardcoded to 10 in GTK+ 1.2 (great idea)

-    static const int KEY_SCROLL_PIXELS = 10;
-
-    return DoScroll(adj, lines*KEY_SCROLL_PIXELS);
+    int diff = 10*lines;

 #endif
 #endif

+
+    return DoScroll(adj, diff);

 }
 
 bool wxTextCtrl::ScrollPages(int pages)
 {
 }
 
 bool wxTextCtrl::ScrollPages(int pages)
 {

-#ifdef __WXGTK20__
-    return FALSE;
-#else

     GtkAdjustment *adj = GetVAdj();
     if ( !adj )
         return FALSE;
 
     return DoScroll(adj, (int)ceil(pages*adj->page_increment));
     GtkAdjustment *adj = GetVAdj();
     if ( !adj )
         return FALSE;
 
     return DoScroll(adj, (int)ceil(pages*adj->page_increment));

-#endif

 }
 
 
 }