Committing wxUSE_DEBUG_NEW_ALWAYS

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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 401fd4d460cd66ced91e15cc973198ef2ebc6deb..f165c20805a586be211de61b7ae13d9771607e17 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -34,25 +34,25 @@ extern bool   g_blockEventsOnDrag;
 //  "changed"
 //-----------------------------------------------------------------------------
 
-static void 
+static void
 gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
 {
     win->SetModified();
-    
+
     win->CalculateScrollbar();
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
-    wxString val( win->GetValue() );
-    if (!val.IsNull()) event.m_commandString = WXSTRINGCAST val;
+    event.SetString( copystring(win->GetValue()) );
     event.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent( event );
+    delete[] event.GetString();
 }
 
 //-----------------------------------------------------------------------------
 // "size_allocate"
 //-----------------------------------------------------------------------------
 
-static void 
+static void
 gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win )
 {
     win->CalculateScrollbar();
@@ -112,7 +112,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
     PreCreation( parent, id, pos, size, style, name );
 
     SetValidator( validator );
-    
+
     m_vScrollbarVisible = TRUE;
 
     bool multi_line = (style & wxTE_MULTILINE) != 0;
@@ -121,7 +121,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
         // a multi-line edit control: create a vertical scrollbar by default and
         // horizontal if requested
         bool bHasHScrollbar = (style & wxHSCROLL) != 0;
- 
+
         // create our control...
         m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
 
@@ -150,7 +150,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
                      (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
                      0, 0);
         gtk_widget_show( m_vScrollbar );
-       
+
         gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
           GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this );
     }
@@ -205,9 +205,9 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
         if (multi_line)
             gtk_text_set_editable( GTK_TEXT(m_text), 1 );
     }
-    
+
     Show( TRUE );
-    
+
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 
@@ -219,23 +219,23 @@ void wxTextCtrl::CalculateScrollbar()
     if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
 
     GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
-    
+
     if (adj->upper - adj->page_size < 0.8)
     {
         if (m_vScrollbarVisible)
         {
-           gtk_widget_hide( m_vScrollbar );
-       
-           m_vScrollbarVisible = FALSE;
+        gtk_widget_hide( m_vScrollbar );
+
+        m_vScrollbarVisible = FALSE;
         }
     }
     else
     {
         if (!m_vScrollbarVisible)
         {
-           gtk_widget_show( m_vScrollbar );
-           
-           m_vScrollbarVisible = TRUE;
+        gtk_widget_show( m_vScrollbar );
+
+        m_vScrollbarVisible = TRUE;
         }
     }
 }
@@ -303,7 +303,7 @@ bool wxTextCtrl::LoadFile( const wxString &file )
 
   Clear();
 
-  FILE *fp = NULL;
+  FILE *fp = (FILE*) NULL;
   struct stat statb;
 
   if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
@@ -321,8 +321,8 @@ bool wxTextCtrl::LoadFile( const wxString &file )
       return FALSE;
     }
     if (fread (text, sizeof (char), len, fp) != (size_t) len)
-       {
-       }
+    {
+    }
     fclose (fp);
 
     text[len] = 0;
@@ -358,7 +358,7 @@ bool wxTextCtrl::SaveFile( const wxString &file )
     }
   else
     {
-      char *text = NULL;
+      char *text = (char*) NULL;
       gint len = 0;
 
       if (m_windowStyle & wxTE_MULTILINE)
@@ -372,13 +372,13 @@ bool wxTextCtrl::SaveFile( const wxString &file )
       }
 
       if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
-       {
-         // Did not write whole file
-       }
+      {
+          // Did not write whole file
+      }
 
       // Make sure newline terminates the file
       if (text[len - 1] != '\n')
-       fputc ('\n', fp);
+          fputc ('\n', fp);
 
       fclose (fp);
 
@@ -431,39 +431,51 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 
 long wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 {
-  if (!(m_windowStyle & wxTE_MULTILINE))
-    return 0;
-  gint len = gtk_text_get_length( GTK_TEXT(m_text) );
-  char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
-  if(!text)
-    return 0;
-  if( pos >= len)
-    return pos=len-1;
+    if ( m_windowStyle & wxTE_MULTILINE )
+    {
+        wxString text = GetValue();
+
+        if( pos >= (long)text.Len()  )
+            return FALSE;
 
-  *x=1;   // Col 1
-  *y=1;   // Line 1
-  for (int i = 0; i < pos; i++ )
+        *x=1;   // Col 1
+        *y=1;   // Line 1
+        for ( const char *p = text.c_str(); *p; p++ )
+        {
+            if (*p == '\n')
+            {
+                (*y)++;
+                *x=1;
+            }
+            else
+                (*x)++;
+        }
+    }
+    else // single line control
     {
-      if (text[i] == '\n')
-       {
-         (*y)++;
-         *x=1;
-       }
-      else
-       (*x)++;
+        if ( pos < GTK_ENTRY(m_text)->text_length )
+        {
+            *y = 1;
+            *x = pos;
+        }
+        else
+        {
+            // index out of bounds
+            return FALSE;
+        }
     }
-  g_free( text );
-  return 1;
+
+    return TRUE;
 }
 
 long wxTextCtrl::XYToPosition(long x, long y ) const
 {
     if (!(m_windowStyle & wxTE_MULTILINE)) return 0;
-    
+
     long pos=0;
 
     for( int i=1; i<y; i++ ) pos += GetLineLength(i);
-    
+
     pos +=x-1; // Pos start with 0
     return pos;
 }
@@ -485,21 +497,21 @@ int wxTextCtrl::GetNumberOfLines() const
         {
             int currentLine = 0;
             for (int i = 0; i < len; i++ )
-           {
+            {
                 if (text[i] == '\n')
-                  currentLine++;
-           }
+                    currentLine++;
+            }
             g_free( text );
             return currentLine;
         }
         else
-       {
+        {
             return 0;
-       }
+        }
     }
     else
     {
-       return 1;
+        return 1;
     }
 }
 
@@ -507,24 +519,20 @@ void wxTextCtrl::SetInsertionPoint( long pos )
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
 
-    int tmp = (int) pos;
     if (m_windowStyle & wxTE_MULTILINE)
-        gtk_text_set_point( GTK_TEXT(m_text), tmp );
+        gtk_text_set_point( GTK_TEXT(m_text), (int)pos );
     else
-        gtk_entry_set_position( GTK_ENTRY(m_text), tmp );
+        gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
 
-    int pos = 0;
     if (m_windowStyle & wxTE_MULTILINE)
-        pos = gtk_text_get_length( GTK_TEXT(m_text) );
+        SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
     else
-      pos = GTK_ENTRY(m_text)->text_length;
-      
-    SetInsertionPoint((pos-1)>0 ? (pos-1):0);
+        gtk_entry_set_position( GTK_ENTRY(m_text), -1 );
 }
 
 void wxTextCtrl::SetEditable( bool editable )
@@ -565,7 +573,7 @@ long wxTextCtrl::GetLastPosition() const
         pos = gtk_text_get_length( GTK_TEXT(m_text) );
     else
         pos = GTK_ENTRY(m_text)->text_length;
-       
+
     return (long)pos-1;
 }
 
@@ -627,7 +635,7 @@ void wxTextCtrl::Clear()
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
     wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
-    
+
     if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
     {
         wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
@@ -751,13 +759,13 @@ void wxTextCtrl::SetBackgroundColour( const wxColour &colour )
     wxControl::SetBackgroundColour( colour );
 
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
-    if (sysbg.Red() == colour.Red() && 
-        sysbg.Green() == colour.Green() && 
+    if (sysbg.Red() == colour.Red() &&
+        sysbg.Green() == colour.Green() &&
         sysbg.Blue() == colour.Blue())
     {
         return;
-    } 
-    
+    }
+
     if (!m_backgroundColour.Ok()) return;
 
     if (m_windowStyle & wxTE_MULTILINE)
@@ -774,7 +782,7 @@ void wxTextCtrl::ApplyWidgetStyle()
     if (m_windowStyle & wxTE_MULTILINE)
     {
         // how ?
-    } 
+    }
     else
     {
         SetWidgetStyle();