#include <ctype.h>
#include <math.h> // for fabs
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkkeysyms.h"
+// TODO: reimplement wxTextCtrl using GtkTextView
+#ifdef __WXGTK20__
+ #define GTK_ENABLE_BROKEN // need this to get GtkText at all
+#endif // __WXGTK20__
+
+#include "wx/gtk/private.h"
+#include <gdk/gdkkeysyms.h>
//-----------------------------------------------------------------------------
// idle system
extern bool g_blockEventsOnDrag;
extern wxCursor g_globalCursor;
+extern wxWindowGTK *g_delayedFocus;
// ----------------------------------------------------------------------------
// helpers
win->CalculateScrollbar();
}
+// ----------------------------------------------------------------------------
+// redraw callback for multiline text
+// ----------------------------------------------------------------------------
+
+#ifndef __WXGTK20__
+
+// redrawing a GtkText from inside a wxYield() call results in crashes (the
+// text sample shows it in its "Add lines" command which shows wxProgressDialog
+// which implicitly calls wxYield()) so we override GtkText::draw() and simply
+// don't do anything if we're inside wxYield()
+
+extern bool wxIsInsideYield;
+
+extern "C" {
+ typedef void (*GtkDrawCallback)(GtkWidget *widget, GdkRectangle *rect);
+}
+
+static GtkDrawCallback gs_gtk_text_draw = NULL;
+
+extern "C"
+void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
+{
+ if ( !wxIsInsideYield )
+ {
+ wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw,
+ _T("infinite recursion in wxgtk_text_draw aborted") );
+
+ gs_gtk_text_draw(widget, rect);
+ }
+}
+
+#endif // __WXGTK20__
+
//-----------------------------------------------------------------------------
// wxTextCtrl
//-----------------------------------------------------------------------------
bool multi_line = (style & wxTE_MULTILINE) != 0;
if (multi_line)
{
-#if (GTK_MINOR_VERSION > 2)
+#ifdef __WXGTK13__
/* a multi-line edit control: create a vertical scrollbar by default and
horizontal if requested */
bool bHasHScrollbar = (style & wxHSCROLL) != 0;
/* always wrap words */
gtk_text_set_word_wrap( GTK_TEXT(m_text), TRUE );
-#if (GTK_MINOR_VERSION > 2)
+#ifdef __WXGTK13__
/* put the horizontal scrollbar in the lower left hand corner */
if (bHasHScrollbar)
{
{
/* a single-line text control: no need for scrollbars */
m_widget =
- m_text = gtk_entry_new();
+ m_text = gtk_entry_new();
}
m_parent->DoAddChild( this );
{
gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
(GtkSignalFunc) gtk_scrollbar_changed_callback, (gpointer) this );
+
+#ifndef __WXGTK20__
+ // only initialize gs_gtk_text_draw once, starting from the next the
+ // klass::draw will already be wxgtk_text_draw
+ if ( !gs_gtk_text_draw )
+ {
+ GtkDrawCallback&
+ draw = GTK_WIDGET_CLASS(GTK_OBJECT(m_text)->klass)->draw;
+
+ gs_gtk_text_draw = draw;
+
+ draw = wxgtk_text_draw;
+ }
+#endif // GTK+ 1.x
}
if (!value.IsEmpty())
{
gint tmp = 0;
-#if GTK_MINOR_VERSION == 0
+#if !GTK_CHECK_VERSION(1, 2, 0)
// if we don't realize it, GTK 1.0.6 dies with a SIGSEGV in
// gtk_editable_insert_text()
gtk_widget_realize(m_text);
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) );
+ SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
}
}
if ( m_windowStyle & wxTE_MULTILINE )
{
// After cursor movements, gtk_text_get_point() is wrong by one.
- gtk_text_set_point( GTK_TEXT(m_text), GTK_EDITABLE(m_text)->current_pos );
+ gtk_text_set_point( GTK_TEXT(m_text), GET_EDITABLE_POS(m_text) );
- // if we have any special style, use it
- if ( !m_defaultStyle.IsDefault() )
- {
- GetInsertionPoint();
-
- wxGtkTextInsert(m_text, m_defaultStyle, txt, txtlen);
- }
- else // no style
- {
- gint len = GTK_EDITABLE(m_text)->current_pos;
- gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len );
- }
+ // always use m_defaultStyle, even if it is empty as otherwise
+ // resetting the style and appending some more text wouldn't work: if
+ // we don't specify the style explicitly, the old style would be used
+ wxGtkTextInsert(m_text, m_defaultStyle, txt, txtlen);
// Bring editable's cursor back uptodate.
- GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+ SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
}
else // single line
{
// This moves the cursor pos to behind the inserted text.
- gint len = GTK_EDITABLE(m_text)->current_pos;
+ gint len = GET_EDITABLE_POS(m_text);
gtk_editable_insert_text( GTK_EDITABLE(m_text), txt, txtlen, &len );
// Bring editable's cursor uptodate.
- GTK_EDITABLE(m_text)->current_pos += text.Len();
+ len += text.Len();
// Bring entry's cursor uptodate.
- gtk_entry_set_position( GTK_ENTRY(m_text), GTK_EDITABLE(m_text)->current_pos );
+ gtk_entry_set_position( GTK_ENTRY(m_text), len );
}
m_modified = TRUE;
/* bring editable's cursor uptodate. another bug in GTK. */
- GTK_EDITABLE(m_text)->current_pos = gtk_text_get_point( GTK_TEXT(m_text) );
+ SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
}
else
{
/* bring editable's cursor uptodate. bug in GTK. */
- GTK_EDITABLE(m_text)->current_pos = (guint32)pos;
+ SET_EDITABLE_POS(m_text, (guint32)pos);
}
}
gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
}
-void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
+void wxTextCtrl::ShowPosition( long pos )
{
-// SetInsertionPoint( pos );
+ if (m_windowStyle & wxTE_MULTILINE)
+ {
+ GtkAdjustment *vp = GTK_TEXT(m_text)->vadj;
+ float totalLines = (float) GetNumberOfLines();
+ long posX;
+ long posY;
+ PositionToXY(pos, &posX, &posY);
+ float posLine = (float) posY;
+ float p = (posLine/totalLines)*(vp->upper - vp->lower) + vp->lower;
+ gtk_adjustment_set_value(GTK_TEXT(m_text)->vadj, p);
+ }
}
long wxTextCtrl::GetInsertionPoint() const
{
wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
- return (long) GTK_EDITABLE(m_text)->current_pos;
+ return (long) GET_EDITABLE_POS(m_text);
}
long wxTextCtrl::GetLastPosition() const
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
-#else
- gtk_editable_cut_clipboard( GTK_EDITABLE(m_text), 0 );
-#endif
+ gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
}
void wxTextCtrl::Copy()
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
-#else
- gtk_editable_copy_clipboard( GTK_EDITABLE(m_text), 0 );
-#endif
+ gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
}
void wxTextCtrl::Paste()
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-#if (GTK_MINOR_VERSION > 0)
- gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
-#else
- gtk_editable_paste_clipboard( GTK_EDITABLE(m_text), 0 );
-#endif
+ gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
}
// Undo/redo
bool wxTextCtrl::CanUndo() const
{
// TODO
- wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
+ //wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
return FALSE;
}
bool wxTextCtrl::CanRedo() const
{
// TODO
- wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
+ //wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
return FALSE;
}
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- long from, to;
+ gint from, to;
+#ifdef __WXGTK20__
+ if ( !gtk_editable_get_selection_bounds(GTK_EDITABLE(m_text), &from, &to) )
+#else
if ( !(GTK_EDITABLE(m_text)->has_selection) )
+#endif
{
from =
to = GetInsertionPoint();
}
else // got selection
{
+#ifndef __WXGTK20__
from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
+#endif
if ( from > to )
{
// exchange them to be compatible with wxMSW
- long tmp = from;
+ gint tmp = from;
from = to;
to = tmp;
}
{
wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
+#ifdef __WXGTK20__
+ return gtk_editable_get_editable(GTK_EDITABLE(m_text));
+#else
return GTK_EDITABLE(m_text)->editable;
+#endif
}
bool wxTextCtrl::IsModified() const
if ((key_event.KeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE))
{
+ // This will invoke the dialog default action, such
+ // as the clicking the default button.
+
wxWindow *top_frame = m_parent;
while (top_frame->GetParent() && !(top_frame->IsTopLevel()))
top_frame = top_frame->GetParent();
- GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
-
- if (window->default_widget)
+
+ if (top_frame && GTK_IS_WINDOW(top_frame->m_widget))
{
- gtk_widget_activate (window->default_widget);
- return;
+ GtkWindow *window = GTK_WINDOW(top_frame->m_widget);
+
+ if (window->default_widget)
+ {
+ gtk_widget_activate (window->default_widget);
+ return;
+ }
}
}
{
wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
- if ( !wxWindowBase::SetFont(font) )
+ if ( !wxTextCtrlBase::SetFont(font) )
{
// font didn't change, nothing to do
return FALSE;
if (!m_widget->window)
return FALSE;
- wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
+ wxColour sysbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
if (sysbg.Red() == colour.Red() &&
sysbg.Green() == colour.Green() &&
sysbg.Blue() == colour.Blue())
gdk_window_set_cursor( window, cursor.GetCursor() );
}
+ if (g_delayedFocus == this)
+ {
+ if (GTK_WIDGET_REALIZED(m_widget))
+ {
+ gtk_widget_grab_focus( m_widget );
+ g_delayedFocus = NULL;
+ }
+ }
+
UpdateWindowUI();
}
projects / wxWidgets.git / blobdiff