static void
gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{
- win->SetModified();
+ if (!win->m_hasVMT) return;
- win->CalculateScrollbar();
+ win->SetModified();
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->m_windowId );
- event.SetString( copystring(win->GetValue()) );
+ event.SetString( win->GetValue() );
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
- delete[] event.GetString();
}
//-----------------------------------------------------------------------------
-// "size_allocate"
+// "changed" from vertical scrollbar
//-----------------------------------------------------------------------------
static void
-gtk_text_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* WXUNUSED(alloc), wxTextCtrl *win )
+gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{
+ if (!win->m_hasVMT) return;
+
win->CalculateScrollbar();
}
BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
EVT_CHAR(wxTextCtrl::OnChar)
+
+ EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
+ EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
+ EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
+ EVT_MENU(wxID_UNDO, wxTextCtrl::OnUndo)
+ EVT_MENU(wxID_REDO, wxTextCtrl::OnRedo)
+
+ EVT_UPDATE_UI(wxID_CUT, wxTextCtrl::OnUpdateCut)
+ EVT_UPDATE_UI(wxID_COPY, wxTextCtrl::OnUpdateCopy)
+ EVT_UPDATE_UI(wxID_PASTE, wxTextCtrl::OnUpdatePaste)
+ EVT_UPDATE_UI(wxID_UNDO, wxTextCtrl::OnUpdateUndo)
+ EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
END_EVENT_TABLE()
#ifndef NO_TEXT_WINDOW_STREAM
SetValidator( validator );
- m_vScrollbarVisible = TRUE;
+ m_vScrollbarVisible = FALSE;
bool multi_line = (style & wxTE_MULTILINE) != 0;
if ( multi_line )
{
- // a multi-line edit control: create a vertical scrollbar by default and
- // horizontal if requested
+ /* a multi-line edit control: create a vertical scrollbar by default and
+ horizontal if requested */
bool bHasHScrollbar = (style & wxHSCROLL) != 0;
- // create our control...
+ /* create our control ... */
m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
- // ... and put into the upper left hand corner of the table
+ /* ... and put into the upper left hand corner of the table */
m_widget = gtk_table_new(bHasHScrollbar ? 2 : 1, 2, FALSE);
+ GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
+
gtk_table_attach( GTK_TABLE(m_widget), m_text, 0, 1, 0, 1,
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
(GtkAttachOptions)(GTK_FILL | GTK_EXPAND | GTK_SHRINK),
0, 0);
- // put the horizontal scrollbar in the lower left hand corner
+ /* put the horizontal scrollbar in the lower left hand corner */
if (bHasHScrollbar)
{
GtkWidget *hscrollbar = gtk_hscrollbar_new(GTK_TEXT(m_text)->hadj);
+ GTK_WIDGET_UNSET_FLAGS( hscrollbar, GTK_CAN_FOCUS );
+
gtk_table_attach(GTK_TABLE(m_widget), hscrollbar, 0, 1, 1, 2,
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
GTK_FILL,
gtk_widget_show(hscrollbar);
}
- // finally, put the vertical scrollbar in the upper right corner
- m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
- gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1,
- GTK_FILL,
- (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
- 0, 0);
- gtk_widget_show( m_vScrollbar );
+ /* we create the vertical scrollbar on demand */
+ m_vScrollbar = (GtkWidget*) NULL;
- gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
- GTK_SIGNAL_FUNC(gtk_text_size_callback), (gpointer)this );
}
else
{
- // a single-line text control: no need for scrollbars
+ /* a single-line text control: no need for scrollbars */
m_widget =
m_text = gtk_entry_new();
}
gtk_widget_show(m_text);
}
- // we want to be notified about text changes
+ /* we want to be notified about text changes */
gtk_signal_connect( GTK_OBJECT(m_text), "changed",
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
- if (!value.IsNull())
+ if (!value.IsEmpty())
{
gint tmp = 0;
gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
- SetInsertionPointEnd();
+
+ if (multi_line)
+ {
+ /* bring editable's cursor uptodate. bug in GTK. */
+
+ GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+ }
}
if (style & wxTE_PASSWORD)
if (multi_line)
gtk_text_set_editable( GTK_TEXT(m_text), 1 );
}
+
+ SetBackgroundColour( parent->GetBackgroundColour() );
+ SetForegroundColour( parent->GetForegroundColour() );
Show( TRUE );
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
+ if (multi_line)
+ {
+ gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
+ (GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this );
+ }
return TRUE;
}
{
if (m_vScrollbarVisible)
{
- gtk_widget_hide( m_vScrollbar );
+ gtk_widget_hide( m_vScrollbar );
- m_vScrollbarVisible = FALSE;
+ m_vScrollbarVisible = FALSE;
}
}
else
{
if (!m_vScrollbarVisible)
{
- gtk_widget_show( m_vScrollbar );
+ if (!m_vScrollbar)
+ {
+ /* finally, put the vertical scrollbar in the upper right corner */
+ m_vScrollbar = gtk_vscrollbar_new( GTK_TEXT(m_text)->vadj );
+ GTK_WIDGET_UNSET_FLAGS( m_vScrollbar, GTK_CAN_FOCUS );
+
+ gtk_table_attach(GTK_TABLE(m_widget), m_vScrollbar, 1, 2, 0, 1,
+ GTK_FILL,
+ (GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
+ 0, 0);
+ }
+
+ gtk_widget_show( m_vScrollbar );
- m_vScrollbarVisible = TRUE;
+ m_vScrollbarVisible = TRUE;
}
}
}
if (m_windowStyle & wxTE_MULTILINE)
{
- //gint len = gtk_text_get_length( GTK_TEXT(m_text) );
- // Find the current insertion point
+ /* this moves the cursor pos to behind the inserted text */
gint len = GTK_EDITABLE(m_text)->current_pos;
- // Insert text at this point
+
gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
- // Note: the insertion point is now at 'len' (past our insertion).
+
+ /* bring editable's cursor uptodate. bug in GTK. */
+ GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+ }
+ else
+ {
+ /* this moves the cursor pos to behind the inserted text */
+ gint len = GTK_EDITABLE(m_text)->current_pos;
+ gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+
+ /* bring editable's cursor uptodate. bug in GTK. */
+ GTK_EDITABLE(m_text)->current_pos += text.Len();
+
+ /* bring entry's cursor uptodate. bug in GTK. */
+ gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos );
+ }
+}
+
+void wxTextCtrl::AppendText( const wxString &text )
+{
+ wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
+
+ if (m_windowStyle & wxTE_MULTILINE)
+ {
+ /* we'll insert at the last position */
+ gint len = gtk_text_get_length( GTK_TEXT(m_text) );
+ gtk_editable_insert_text( GTK_EDITABLE(m_text), text, text.Length(), &len );
+
+ /* bring editable's cursor uptodate. bug in GTK. */
+ GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
}
else
{
void wxTextCtrl::SetInsertionPoint( long pos )
{
- int len;
wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
- if (m_windowStyle & wxTE_MULTILINE) {
- //gtk_text_set_point( GTK_TEXT(m_text), (int)pos );
- /* HH: The call commented out above doesn't do anything. Don't know
- * why. The code below isn't perfect either; it doesn't move the
- * actual cursor, but subsequent calls to WriteText will insert
- * text at the set position and move the displayed cursor behind it as
- * well. I guess this is good enough for most uses. */
- len = gtk_text_get_length( GTK_TEXT(m_text) );
- if ( (pos < 0) || (pos > len) )
- pos = len;
- GTK_EDITABLE(m_text)->current_pos = (int)pos;
+
+ if (m_windowStyle & wxTE_MULTILINE)
+ {
+ /* seems to be broken in GTK 1.0.X:
+ gtk_text_set_point( GTK_TEXT(m_text), (int)pos ); */
+
+ gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
+ GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+
+ /* we fake a set_point by inserting and deleting. as the user
+ isn't supposed to get to know about thos non-sense, we
+ disconnect so that no events are sent to the user program. */
+
+ gint tmp = (gint)pos;
+ gtk_editable_insert_text( GTK_EDITABLE(m_text), " ", 1, &tmp );
+ gtk_editable_delete_text( GTK_EDITABLE(m_text), tmp-1, tmp );
+
+ gtk_signal_connect( GTK_OBJECT(m_text), "changed",
+ GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
+
+ /* bring editable's cursor uptodate. another bug in GTK. */
+
+ GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
}
else
+ {
gtk_entry_set_position( GTK_ENTRY(m_text), (int)pos );
+
+ /* bring editable's cursor uptodate. bug in GTK. */
+
+ GTK_EDITABLE(m_text)->current_pos = pos;
+ }
}
void wxTextCtrl::SetInsertionPointEnd()
{
wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
#else
gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
{
wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
#else
gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 );
{
wxCHECK_RET( m_text != NULL, "invalid text ctrl" );
-#if (GTK_MINOR_VERSION == 1)
+#if (GTK_MINOR_VERSION > 0)
gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
#else
gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
#endif
}
+bool wxTextCtrl::CanCopy() const
+{
+ // Can copy if there's a selection
+ long from, to;
+ GetSelection(& from, & to);
+ return (from != to) ;
+}
+
+bool wxTextCtrl::CanCut() const
+{
+ // Can cut if there's a selection
+ long from, to;
+ GetSelection(& from, & to);
+ return (from != to) ;
+}
+
+bool wxTextCtrl::CanPaste() const
+{
+ return IsEditable() ;
+}
+
+// Undo/redo
+void wxTextCtrl::Undo()
+{
+ // TODO
+ wxFAIL_MSG( "wxTextCtrl::Undo not implemented" );
+}
+
+void wxTextCtrl::Redo()
+{
+ // TODO
+ wxFAIL_MSG( "wxTextCtrl::Redo not implemented" );
+}
+
+bool wxTextCtrl::CanUndo() const
+{
+ // TODO
+ wxFAIL_MSG( "wxTextCtrl::CanUndo not implemented" );
+ return FALSE;
+}
+
+bool wxTextCtrl::CanRedo() const
+{
+ // TODO
+ wxFAIL_MSG( "wxTextCtrl::CanRedo not implemented" );
+ return FALSE;
+}
+
+// If the return values from and to are the same, there is no
+// selection.
+void wxTextCtrl::GetSelection(long* from, long* to) const
+{
+ // TODO
+ *from = 0;
+ *to = 0;
+ wxFAIL_MSG( "wxTextCtrl::GetSelection not implemented" );
+}
+
+bool wxTextCtrl::IsEditable() const
+{
+ // TODO
+ wxFAIL_MSG( "wxTextCtrl::IsEditable not implemented" );
+ return FALSE;
+}
+
void wxTextCtrl::Clear()
{
SetValue( "" );
wxTextCtrl& wxTextCtrl::operator<<(const wxString& s)
{
- WriteText(s);
+ AppendText(s);
return *this;
}
{
static char buf[100];
sprintf(buf, "%.2f", f);
- WriteText(buf);
+ AppendText(buf);
return *this;
}
{
static char buf[100];
sprintf(buf, "%.2f", d);
- WriteText(buf);
+ AppendText(buf);
return *this;
}
{
static char buf[100];
sprintf(buf, "%i", i);
- WriteText(buf);
+ AppendText(buf);
return *this;
}
{
static char buf[100];
sprintf(buf, "%ld", i);
- WriteText(buf);
+ AppendText(buf);
return *this;
}
buf[0] = c;
buf[1] = 0;
- WriteText(buf);
+ AppendText(buf);
return *this;
}
#endif
}
}
+void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
+{
+ Cut();
+}
+
+void wxTextCtrl::OnCopy(wxCommandEvent& WXUNUSED(event))
+{
+ Copy();
+}
+
+void wxTextCtrl::OnPaste(wxCommandEvent& WXUNUSED(event))
+{
+ Paste();
+}
+
+void wxTextCtrl::OnUndo(wxCommandEvent& WXUNUSED(event))
+{
+ Undo();
+}
+
+void wxTextCtrl::OnRedo(wxCommandEvent& WXUNUSED(event))
+{
+ Redo();
+}
+
+void wxTextCtrl::OnUpdateCut(wxUpdateUIEvent& event)
+{
+ event.Enable( CanCut() );
+}
+
+void wxTextCtrl::OnUpdateCopy(wxUpdateUIEvent& event)
+{
+ event.Enable( CanCopy() );
+}
+
+void wxTextCtrl::OnUpdatePaste(wxUpdateUIEvent& event)
+{
+ event.Enable( CanPaste() );
+}
+
+void wxTextCtrl::OnUpdateUndo(wxUpdateUIEvent& event)
+{
+ event.Enable( CanUndo() );
+}
+
+void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
+{
+ event.Enable( CanRedo() );
+}
projects / wxWidgets.git / blobdiff