On Robert's request I have added the html-version of my wxQt proposal.

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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index 890393380a23f194868b134fee872e5b80737b38..86eef711a7916225235bfba8b19c6bdd8b4a207a 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -21,6 +21,11 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
 

+void gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
+{
+  win->m_modified = TRUE;
+};
+

 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
 //  EVT_CHAR(wxTextCtrl::OnChar)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
 //  EVT_CHAR(wxTextCtrl::OnChar)


@@ -28,43 +33,58 @@ END_EVENT_TABLE()
 
 wxTextCtrl::wxTextCtrl(void) : streambuf()
 {
 
 wxTextCtrl::wxTextCtrl(void) : streambuf()
 {

+  m_modified = FALSE;

 };
 
 };
 

-wxTextCtrl::wxTextCtrl( wxWindow *parent, const wxWindowID id, const wxString &value, 
-      const wxPoint &pos, const wxSize &size, 
-      const int style, const wxString &name ) : streambuf()
+wxTextCtrl::wxTextCtrl( wxWindow *parent, wxWindowID id, const wxString &value,
+      const wxPoint &pos, const wxSize &size,
+      int style, const wxString &name ) : streambuf()

 {
 {

+  m_modified = FALSE;

   Create( parent, id, value, pos, size, style, name );
 };
 
   Create( parent, id, value, pos, size, style, name );
 };
 

-bool wxTextCtrl::Create( wxWindow *parent, const wxWindowID id, const wxString &value,
-      const wxPoint &pos, const wxSize &size, 
-      const int style, const wxString &name )
+bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
+      const wxPoint &pos, const wxSize &size,
+      int style, const wxString &name )

 {
   m_needParent = TRUE;
 {
   m_needParent = TRUE;

-  
+

   PreCreation( parent, id, pos, size, style, name );
   PreCreation( parent, id, pos, size, style, name );

-  
+

   if (style & wxTE_MULTILINE)
     m_widget = gtk_text_new( NULL, NULL );
   else
     m_widget = gtk_entry_new();
   if (style & wxTE_MULTILINE)
     m_widget = gtk_text_new( NULL, NULL );
   else
     m_widget = gtk_entry_new();

-    
-  if (!value.IsNull())
-  {
-    gint tmp = 0;
-    gtk_editable_insert_text( GTK_EDITABLE(m_widget), value, value.Length(), &tmp );
-  };
-  
+

   wxSize newSize = size;
   if (newSize.x == -1) newSize.x = 80;
   if (newSize.y == -1) newSize.y = 26;
   SetSize( newSize.x, newSize.y );
   wxSize newSize = size;
   if (newSize.x == -1) newSize.x = 80;
   if (newSize.y == -1) newSize.y = 26;
   SetSize( newSize.x, newSize.y );

-  
+

   PostCreation();
   PostCreation();

-  
+
+  // we want to be notified about text changes
+  gtk_signal_connect(GTK_OBJECT(m_widget), "changed",
+                     GTK_SIGNAL_FUNC(gtk_text_changed_callback),
+                     (gpointer)this);
+
+  if (!value.IsNull())
+  {
+    gint tmp = 0;
+    gtk_editable_insert_text( GTK_EDITABLE(m_widget), value, value.Length(), &tmp );
+  };
+
+  if (style & wxREADONLY)
+  {
+  }
+  else
+  {
+    if (style & wxTE_MULTILINE) gtk_text_set_editable( GTK_TEXT(m_widget), 1 );
+  };
+

   Show( TRUE );
   Show( TRUE );

-    
+

   return TRUE;
 };
 
   return TRUE;
 };
 


@@ -74,7 +94,7 @@ wxString wxTextCtrl::GetValue(void) const
   if (m_windowStyle & wxTE_MULTILINE)
   {
     gint len = gtk_text_get_length( GTK_TEXT(m_widget) );
   if (m_windowStyle & wxTE_MULTILINE)
   {
     gint len = gtk_text_get_length( GTK_TEXT(m_widget) );

-    tmp = gtk_editable_get_chars( GTK_EDITABLE(m_widget), 0, len-1 );
+    tmp = gtk_editable_get_chars( GTK_EDITABLE(m_widget), 0, len );

   }
   else
   {
   }
   else
   {


@@ -90,7 +110,7 @@ void wxTextCtrl::SetValue( const wxString &value )
   if (m_windowStyle & wxTE_MULTILINE)
   {
     gint len = gtk_text_get_length( GTK_TEXT(m_widget) );
   if (m_windowStyle & wxTE_MULTILINE)
   {
     gint len = gtk_text_get_length( GTK_TEXT(m_widget) );

-    gtk_editable_delete_text( GTK_EDITABLE(m_widget), 0, len-1 );
+    gtk_editable_delete_text( GTK_EDITABLE(m_widget), 0, len );

     len = 0;
     gtk_editable_insert_text( GTK_EDITABLE(m_widget), tmp, tmp.Length(), &len );
   }
     len = 0;
     gtk_editable_insert_text( GTK_EDITABLE(m_widget), tmp, tmp.Length(), &len );
   }


@@ -103,6 +123,7 @@ void wxTextCtrl::SetValue( const wxString &value )
 void wxTextCtrl::WriteText( const wxString &text )
 {
   if (text.IsNull()) return;
 void wxTextCtrl::WriteText( const wxString &text )
 {
   if (text.IsNull()) return;

+

   if (m_windowStyle & wxTE_MULTILINE)
   {
     gint len = gtk_text_get_length( GTK_TEXT(m_widget) );
   if (m_windowStyle & wxTE_MULTILINE)
   {
     gint len = gtk_text_get_length( GTK_TEXT(m_widget) );


@@ -114,36 +135,45 @@ void wxTextCtrl::WriteText( const wxString &text )
   };
 };
 
   };
 };
 

-/*
-wxString wxTextCtrl::GetLineText( const long lineNo ) const
+bool wxTextCtrl::LoadFile( const wxString &WXUNUSED(file) )

 {
 {

+  wxFAIL_MSG("wxTextCtrl::LoadFile not implemented");
+
+  return FALSE;

 };
 
 };
 

-bool wxTextCtrl::LoadFile( const wxString &file )
+bool wxTextCtrl::SaveFile( const wxString &WXUNUSED(file) )

 {
 {

+  wxFAIL_MSG("wxTextCtrl::SaveFile not implemented");
+
+  return FALSE;

 };
 
 };
 

-bool wxTextCtrl::SaveFile( const wxString &file )
+bool wxTextCtrl::IsModified(void)

 {
 {

+  return m_modified;

 };
 
 void wxTextCtrl::DiscardEdits(void)
 {
 };
 
 void wxTextCtrl::DiscardEdits(void)
 {

+  m_modified = FALSE;

 };
 
 };
 

-bool wxTextCtrl::IsModified(void)
+/*
+wxString wxTextCtrl::GetLineText( long lineNo ) const

 {
 };
 
 {
 };
 

+

 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &event )
 {
 };
 
 void wxTextCtrl::OnDropFiles( wxDropFilesEvent &event )
 {
 };
 

-long wxTextCtrl::PositionToXY( const long pos, long *x, long *y ) const
+long wxTextCtrl::PositionToXY( long pos, long *x, long *y ) const

 {
 };
 
 {
 };
 

-long wxTextCtrl::XYToPosition( const long x, const long y )
+long wxTextCtrl::XYToPosition( long x, long y )

 {
 };
 
 {
 };
 


@@ -152,7 +182,7 @@ int wxTextCtrl::GetNumberOfLines(void)
 };
 
 */
 };
 
 */

-void wxTextCtrl::SetInsertionPoint( const long pos )
+void wxTextCtrl::SetInsertionPoint( long pos )

 {
   int tmp = (int) pos;
   if (m_windowStyle & wxTE_MULTILINE)
 {
   int tmp = (int) pos;
   if (m_windowStyle & wxTE_MULTILINE)


@@ -171,7 +201,7 @@ void wxTextCtrl::SetInsertionPointEnd(void)
   SetInsertionPoint( pos-1 );
 };
 
   SetInsertionPoint( pos-1 );
 };
 

-void wxTextCtrl::SetEditable( const bool editable )
+void wxTextCtrl::SetEditable( bool editable )

 {
   if (m_windowStyle & wxTE_MULTILINE)
     gtk_text_set_editable( GTK_TEXT(m_widget), editable );
 {
   if (m_windowStyle & wxTE_MULTILINE)
     gtk_text_set_editable( GTK_TEXT(m_widget), editable );


@@ -179,13 +209,14 @@ void wxTextCtrl::SetEditable( const bool editable )
     gtk_entry_set_editable( GTK_ENTRY(m_widget), editable );
 };
 
     gtk_entry_set_editable( GTK_ENTRY(m_widget), editable );
 };
 

-void wxTextCtrl::SetSelection( const long from, const long to )
+void wxTextCtrl::SetSelection( long from, long to )

 {
   gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
 };
 
 {
   gtk_editable_select_region( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
 };
 

-void wxTextCtrl::ShowPosition( const long WXUNUSED(pos) )
+void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )

 {
 {

+  wxFAIL_MSG("wxTextCtrl::ShowPosition not implemented");

 };
 
 long wxTextCtrl::GetInsertionPoint(void) const
 };
 
 long wxTextCtrl::GetInsertionPoint(void) const


@@ -203,12 +234,12 @@ long wxTextCtrl::GetLastPosition(void) const
   return (long)pos-1;
 };
 
   return (long)pos-1;
 };
 

-void wxTextCtrl::Remove( const long from, const long to )
+void wxTextCtrl::Remove( long from, long to )

 {
   gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
 };
 
 {
   gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
 };
 

-void wxTextCtrl::Replace( const long from, const long to, const wxString &value )
+void wxTextCtrl::Replace( long from, long to, const wxString &value )

 {
   gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
   if (value.IsNull()) return;
 {
   gtk_editable_delete_text( GTK_EDITABLE(m_widget), (gint)from, (gint)to );
   if (value.IsNull()) return;


@@ -248,7 +279,7 @@ int wxTextCtrl::overflow(int c)
     wxError("Streambuf allocation failed","Internal error");
     return EOF;
   }
     wxError("Streambuf allocation failed","Internal error");
     return EOF;
   }

-  
+

   // Verify that there are no characters in get area
   if ( gptr() && gptr() < egptr() )
   {
   // Verify that there are no characters in get area
   if ( gptr() && gptr() < egptr() )
   {


@@ -347,7 +378,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
   return *this;
 }
 
   return *this;
 }
 

-wxTextCtrl& wxTextCtrl::operator<<(const float f)
+wxTextCtrl& wxTextCtrl::operator<<(float f)

 {
   static char buf[100];
   sprintf(buf, "%.2f", f);
 {
   static char buf[100];
   sprintf(buf, "%.2f", f);


@@ -355,7 +386,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const float f)
   return *this;
 }
 
   return *this;
 }
 

-wxTextCtrl& wxTextCtrl::operator<<(const double d)
+wxTextCtrl& wxTextCtrl::operator<<(double d)

 {
   static char buf[100];
   sprintf(buf, "%.2f", d);
 {
   static char buf[100];
   sprintf(buf, "%.2f", d);


@@ -363,7 +394,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const double d)
   return *this;
 }
 
   return *this;
 }
 

-wxTextCtrl& wxTextCtrl::operator<<(const int i)
+wxTextCtrl& wxTextCtrl::operator<<(int i)

 {
   static char buf[100];
   sprintf(buf, "%i", i);
 {
   static char buf[100];
   sprintf(buf, "%i", i);


@@ -371,7 +402,7 @@ wxTextCtrl& wxTextCtrl::operator<<(const int i)
   return *this;
 }
 
   return *this;
 }
 

-wxTextCtrl& wxTextCtrl::operator<<(const long i)
+wxTextCtrl& wxTextCtrl::operator<<(long i)

 {
   static char buf[100];
   sprintf(buf, "%ld", i);
 {
   static char buf[100];
   sprintf(buf, "%ld", i);