/////////////////////////////////////////////////////////////////////////////
-// Name: textctrl.cpp
+// Name: src/gtk1/textctrl.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "textctrl.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/textctrl.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/settings.h"
-#include "wx/panel.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/panel.h"
+ #include "wx/settings.h"
+ #include "wx/math.h"
+#endif
+
#include "wx/strconv.h"
#include "wx/fontutil.h" // for wxNativeFontInfo (GetNativeFontInfo())
+#include "wx/evtloop.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <ctype.h>
-#include <math.h> // for fabs
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
#include <gdk/gdkkeysyms.h>
//-----------------------------------------------------------------------------
// data
//-----------------------------------------------------------------------------
-extern bool g_blockEventsOnDrag;
extern wxCursor g_globalCursor;
extern wxWindowGTK *g_delayedFocus;
// helpers
// ----------------------------------------------------------------------------
-#ifdef __WXGTK20__
-static void wxGtkTextInsert(GtkWidget *text,
- GtkTextBuffer *text_buffer,
- const wxTextAttr& attr,
- wxCharBuffer buffer)
-
-{
- PangoFontDescription *font_description = attr.HasFont()
- ? attr.GetFont().GetNativeFontInfo()->description
- : NULL;
-
- GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
- : NULL;
-
- GdkColor *colBg = attr.HasBackgroundColour()
- ? attr.GetBackgroundColour().GetColor()
- : NULL;
-
- GtkTextTag *tag;
- tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description,
- "foreground-gdk", colFg,
- "background-gdk", colBg, NULL );
-
- GtkTextIter iter;
- gtk_text_buffer_get_iter_at_mark( text_buffer, &iter,
- gtk_text_buffer_get_insert (text_buffer) );
-
- gtk_text_buffer_insert_with_tags( text_buffer, &iter, buffer, strlen(buffer), tag, NULL );
-}
-#else
+extern "C" {
static void wxGtkTextInsert(GtkWidget *text,
const wxTextAttr& attr,
const char *txt,
size_t len)
{
- GdkFont *font = attr.HasFont() ? attr.GetFont().GetInternalFont()
- : NULL;
+ wxFont tmpFont;
+ GdkFont *font;
+ if (attr.HasFont())
+ {
+ tmpFont = attr.GetFont();
+
+ // FIXME: if this crashes because tmpFont goes out of scope and the GdkFont is
+ // deleted, then we need to call gdk_font_ref on font.
+ // This is because attr.GetFont() now returns a temporary font since wxTextAttr
+ // no longer stores a wxFont object, for efficiency.
+
+ font = tmpFont.GetInternalFont();
+ }
+ else
+ font = NULL;
GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
: NULL;
gtk_text_insert( GTK_TEXT(text), font, colFg, colBg, txt, len );
}
-#endif // GTK 1.x
+}
// ----------------------------------------------------------------------------
// "insert_text" for GtkEntry
// ----------------------------------------------------------------------------
+extern "C" {
static void
gtk_insert_text_callback(GtkEditable *editable,
- const gchar *new_text,
- gint new_text_length,
- gint *position,
+ const gchar *WXUNUSED(new_text),
+ gint WXUNUSED(new_text_length),
+ gint *WXUNUSED(position),
wxTextCtrl *win)
{
if (g_isIdle)
// we should only be called if we have a max len limit at all
GtkEntry *entry = GTK_ENTRY (editable);
- wxCHECK_RET( entry->text_max_length, _T("shouldn't be called") );
+ wxCHECK_RET( entry->text_max_length, wxT("shouldn't be called") );
// check that we don't overflow the max length limit
//
wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId());
event.SetEventObject(win);
event.SetString(win->GetValue());
- win->GetEventHandler()->ProcessEvent( event );
+ win->HandleWindowEvent( event );
}
}
+}
//-----------------------------------------------------------------------------
// "changed"
//-----------------------------------------------------------------------------
+extern "C" {
static void
-gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win )
+gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{
if ( win->IgnoreTextUpdate() )
return;
wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
event.SetEventObject( win );
- event.SetString( win->GetValue() );
- win->GetEventHandler()->ProcessEvent( event );
+ win->HandleWindowEvent( event );
+}
}
//-----------------------------------------------------------------------------
// "changed" from vertical scrollbar
//-----------------------------------------------------------------------------
-#ifndef __WXGTK20__
+extern "C" {
static void
gtk_scrollbar_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
{
win->CalculateScrollbar();
}
-#endif
+}
// ----------------------------------------------------------------------------
// 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)
+extern "C" {
+static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
{
- if ( !wxIsInsideYield )
+ wxEventLoopBase* loop = wxEventLoopBase::GetActive();
+ if ( loop && !loop->IsYielding() )
{
wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw,
- _T("infinite recursion in wxgtk_text_draw aborted") );
+ wxT("infinite recursion in wxgtk_text_draw aborted") );
gs_gtk_text_draw(widget, rect);
}
}
-
-#endif // __WXGTK20__
+}
//-----------------------------------------------------------------------------
// wxTextCtrl
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,wxControl)
-
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
void wxTextCtrl::Init()
{
m_ignoreNextUpdate =
- m_modified = FALSE;
- m_updateFont = FALSE;
+ m_modified = false;
+ SetUpdateFont(false);
m_text =
- m_vScrollbar = (GtkWidget *)NULL;
+ m_vScrollbar = NULL;
+}
+
+wxTextCtrl::~wxTextCtrl()
+{
}
wxTextCtrl::wxTextCtrl( wxWindow *parent,
const wxValidator& validator,
const wxString &name )
{
- m_needParent = TRUE;
- m_acceptsFocus = TRUE;
+ m_needParent = true;
+ m_acceptsFocus = true;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxTextCtrl creation failed") );
- return FALSE;
+ return false;
}
- m_vScrollbarVisible = FALSE;
+ m_vScrollbarVisible = false;
bool multi_line = (style & wxTE_MULTILINE) != 0;
-#ifdef __WXGTK20__
- GtkTextBuffer *buffer = NULL;
-#endif
-
if (multi_line)
{
-#ifdef __WXGTK20__
- // Create view
- m_text = gtk_text_view_new();
-
- buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
- // create scrolled window
- m_widget = gtk_scrolled_window_new( NULL, NULL );
- gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( m_widget ),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
-
- // Insert view into scrolled window
- gtk_container_add( GTK_CONTAINER(m_widget), m_text );
-
- // Global settings which can be overridden by tags, I guess.
- if (HasFlag( wxHSCROLL ))
- gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_NONE );
- else
- gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( m_text ), GTK_WRAP_WORD );
-
- if (!HasFlag(wxNO_BORDER))
- gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(m_widget), GTK_SHADOW_IN );
-#else
// create our control ...
- m_text = gtk_text_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
+ m_text = gtk_text_new( NULL, NULL );
// ... and put into the upper left hand corner of the table
- bool bHasHScrollbar = FALSE;
+ bool bHasHScrollbar = false;
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,
GTK_FILL,
(GtkAttachOptions)(GTK_EXPAND | GTK_FILL | GTK_SHRINK),
0, 0);
-#endif
}
else
{
m_focusWidget = m_text;
- PostCreation();
- InheritAttributes();
-
- wxSize size_best( DoGetBestSize() );
- wxSize new_size( size );
- if (new_size.x == -1)
- new_size.x = size_best.x;
- if (new_size.y == -1)
- new_size.y = size_best.y;
- if ((new_size.x != size.x) || (new_size.y != size.y))
- SetSize( new_size.x, new_size.y );
+ PostCreation(size);
if (multi_line)
gtk_widget_show(m_text);
-#ifndef __WXGTK20__
if (multi_line)
{
gtk_signal_connect(GTK_OBJECT(GTK_TEXT(m_text)->vadj), "changed",
draw = wxgtk_text_draw;
}
}
-#endif // GTK+ 1.x
- if (!value.IsEmpty())
+ if (!value.empty())
{
-#ifdef __WXGTK20__
- SetValue( value );
-#else
-
#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()
wxWX2MBbuf val = value.mbc_str();
gtk_editable_insert_text( GTK_EDITABLE(m_text), val, strlen(val), &tmp );
#else
- gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &tmp );
+ gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.length(), &tmp );
#endif
if (multi_line)
// Bring editable's cursor uptodate. Bug in GTK.
SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
}
-
-#endif
}
if (style & wxTE_PASSWORD)
{
if (!multi_line)
gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
-#ifdef __WXGTK20__
- else
- gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
- }
-#else
}
else
{
if (multi_line)
gtk_text_set_editable( GTK_TEXT(m_text), 1 );
}
-#endif
// We want to be notified about text changes.
-#ifdef __WXGTK20__
- if (multi_line)
- {
- g_signal_connect( G_OBJECT(buffer), "changed",
- GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
- }
- else
-#endif
- {
gtk_signal_connect( GTK_OBJECT(m_text), "changed",
- GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
- }
-
- // we don't set a valid background colour, because the window
- // manager should use a default one
- m_backgroundColour = wxColour();
-
- wxColour colFg = parent->GetForegroundColour();
- SetForegroundColour( colFg );
+ GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
m_cursor = wxCursor( wxCURSOR_IBEAM );
- wxTextAttr attrDef( colFg, m_backgroundColour, parent->GetFont() );
+ wxTextAttr attrDef(GetForegroundColour(), GetBackgroundColour(), GetFont());
SetDefaultStyle( attrDef );
- Show( TRUE );
-
- return TRUE;
+ return true;
}
+
void wxTextCtrl::CalculateScrollbar()
{
-#ifndef __WXGTK20__
if ((m_windowStyle & wxTE_MULTILINE) == 0) return;
GtkAdjustment *adj = GTK_TEXT(m_text)->vadj;
if (m_vScrollbarVisible)
{
gtk_widget_hide( m_vScrollbar );
- m_vScrollbarVisible = FALSE;
+ m_vScrollbarVisible = false;
}
}
else
if (!m_vScrollbarVisible)
{
gtk_widget_show( m_vScrollbar );
- m_vScrollbarVisible = TRUE;
+ m_vScrollbarVisible = true;
}
}
-#endif
}
-wxString wxTextCtrl::GetValue() const
+wxString wxTextCtrl::DoGetValue() const
{
- wxCHECK_MSG( m_text != NULL, wxT(""), wxT("invalid text ctrl") );
+ wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
wxString tmp;
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
- GtkTextIter start;
- gtk_text_buffer_get_start_iter( text_buffer, &start );
- GtkTextIter end;
- gtk_text_buffer_get_end_iter( text_buffer, &end );
- gchar *text = gtk_text_buffer_get_text( text_buffer, &start, &end, TRUE );
-
-#if wxUSE_UNICODE
- wxWCharBuffer buffer( wxConvUTF8.cMB2WX( text ) );
-#else
- wxCharBuffer buffer( wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC( text ) ) );
-#endif
- tmp = buffer;
-
- g_free( text );
-#else
gint len = gtk_text_get_length( GTK_TEXT(m_text) );
char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
tmp = text;
g_free( text );
-#endif
}
else
{
return tmp;
}
-void wxTextCtrl::SetValue( const wxString &value )
+void wxTextCtrl::DoSetValue( const wxString &value, int flags )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- if (m_windowStyle & wxTE_MULTILINE)
+ if ( !(flags & SetValue_SendEvent) )
{
-#ifdef __WXGTK20__
-
-#if wxUSE_UNICODE
- wxCharBuffer buffer( wxConvUTF8.cWX2MB( value) );
-#else
- wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( value ) ) );
-#endif
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
- gtk_text_buffer_set_text( text_buffer, buffer, strlen(buffer) );
+ // do not generate events
+ IgnoreNextTextUpdate();
+ }
-#else
+ if (m_windowStyle & wxTE_MULTILINE)
+ {
gint len = gtk_text_get_length( GTK_TEXT(m_text) );
gtk_editable_delete_text( GTK_EDITABLE(m_text), 0, len );
len = 0;
- gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.Length(), &len );
-#endif
+ gtk_editable_insert_text( GTK_EDITABLE(m_text), value.mbc_str(), value.length(), &len );
}
else
{
}
// GRG, Jun/2000: Changed this after a lot of discussion in
- // the lists. wxWindows 2.2 will have a set of flags to
+ // the lists. wxWidgets 2.2 will have a set of flags to
// customize this behaviour.
SetInsertionPoint(0);
- m_modified = FALSE;
+ m_modified = false;
}
void wxTextCtrl::WriteText( const wxString &text )
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 wxUSE_UNICODE
- wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
- wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
- // TODO: Call whatever is needed to delete the selection.
- wxGtkTextInsert( m_text, text_buffer, m_defaultStyle, buffer );
-
- GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment( GTK_SCROLLED_WINDOW(m_widget) );
- // Scroll to cursor, but only if scrollbar thumb is at the very bottom
- if ( adj->value == adj->upper - adj->page_size )
- {
- gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text),
- gtk_text_buffer_get_insert( text_buffer ), 0.0, FALSE, 0.0, 1.0 );
- }
-#else // GTK 1.x
// After cursor movements, gtk_text_get_point() is wrong by one.
gtk_text_set_point( GTK_TEXT(m_text), GET_EDITABLE_POS(m_text) );
// 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
gtk_editable_delete_selection( GTK_EDITABLE(m_text) );
- wxGtkTextInsert(m_text, m_defaultStyle, text.c_str(), text.Len());
+ wxGtkTextInsert(m_text, m_defaultStyle, text.c_str(), text.length());
// we called wxGtkTextInsert with correct font, no need to do anything
// in UpdateFontIfNeeded() any longer
if ( !text.empty() )
{
- m_updateFont = FALSE;
+ SetUpdateFont(false);
}
// Bring editable's cursor back uptodate.
SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
-#endif // GTK 1.x/2.0
}
else // single line
{
// This moves the cursor pos to behind the inserted text.
gint len = GET_EDITABLE_POS(m_text);
-#ifdef __WXGTK20__
-
-#if wxUSE_UNICODE
- wxCharBuffer buffer( wxConvUTF8.cWX2MB( text ) );
-#else
- wxCharBuffer buffer( wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) ) );
-#endif
- gtk_editable_insert_text( GTK_EDITABLE(m_text), buffer, strlen(buffer), &len );
-
-#else
- gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.Len(), &len );
-#endif
+ gtk_editable_insert_text( GTK_EDITABLE(m_text), text.c_str(), text.length(), &len );
// Bring entry's cursor uptodate.
gtk_entry_set_position( GTK_ENTRY(m_text), len );
}
- m_modified = TRUE;
+ m_modified = oldModified;
}
void wxTextCtrl::AppendText( const wxString &text )
{
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifndef __WXGTK20__
gint len = gtk_text_get_length( GTK_TEXT(m_text) );
char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
if (text)
{
- wxString buf(wxT(""));
+ wxString buf;
long i;
int currentLine = 0;
for (i = 0; currentLine != lineNo && text[i]; i++ )
{
return wxEmptyString;
}
-#else
- GtkTextBuffer *text_buffer;
- text_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(m_text));
- GtkTextIter line;
- gtk_text_buffer_get_iter_at_line(text_buffer,&line,lineNo);
- GtkTextIter end;
- gtk_text_buffer_get_end_iter(text_buffer,&end );
- gchar *text = gtk_text_buffer_get_text(text_buffer,&line,&end,TRUE);
- wxString result(wxGTK_CONV_BACK(text));
- g_free(text);
- return result.BeforeFirst(wxT('\n'));
-#endif
}
else
{
wxString text = GetValue();
// cast to prevent warning. But pos really should've been unsigned.
- if( (unsigned long)pos > text.Len() )
- return FALSE;
+ if( (unsigned long)pos > text.length() )
+ return false;
*x=0; // First Col
*y=0; // First Line
else
{
// index out of bounds
- return FALSE;
+ return false;
}
}
- return TRUE;
+ return true;
}
long wxTextCtrl::XYToPosition(long x, long y ) const
int wxTextCtrl::GetLineLength(long lineNo) const
{
wxString str = GetLineText (lineNo);
- return (int) str.Length();
+ return (int) str.length();
}
int wxTextCtrl::GetNumberOfLines() const
{
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
- return gtk_text_buffer_get_line_count( buffer );
-#else
gint len = gtk_text_get_length( GTK_TEXT(m_text) );
char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), 0, len );
{
return 0;
}
-#endif
}
else
{
{
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 );
-#else
gtk_signal_disconnect_by_func( GTK_OBJECT(m_text),
GTK_SIGNAL_FUNC(gtk_text_changed_callback), (gpointer)this);
// bring editable's cursor uptodate. Bug in GTK.
SET_EDITABLE_POS(m_text, gtk_text_get_point( GTK_TEXT(m_text) ));
-#endif
}
else
{
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
- GtkTextIter end;
- gtk_text_buffer_get_end_iter( text_buffer, &end );
- gtk_text_buffer_place_cursor( text_buffer, &end );
-#else
SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
-#endif
}
else
{
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- gtk_text_view_set_editable( GTK_TEXT_VIEW(m_text), editable );
-#else
gtk_text_set_editable( GTK_TEXT(m_text), editable );
-#endif
}
else
{
}
}
-bool wxTextCtrl::Enable( bool enable )
+void wxTextCtrl::DoEnable( bool enable )
{
- if (!wxWindowBase::Enable(enable))
- {
- // nothing to do
- return FALSE;
- }
-
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- SetEditable( enable );
-#else
gtk_text_set_editable( GTK_TEXT(m_text), enable );
- OnParentEnable(enable);
-#endif
}
else
{
gtk_widget_set_sensitive( m_text, enable );
}
-
- return TRUE;
}
// wxGTK-specific: called recursively by Enable,
// to give widgets an oppprtunity to correct their colours after they
// have been changed by Enable
-void wxTextCtrl::OnParentEnable( bool enable )
+void wxTextCtrl::OnEnabled( bool WXUNUSED(enable) )
{
+ if ( IsSingleLine() )
+ return;
+
// If we have a custom background colour, we use this colour in both
// disabled and enabled mode, or we end up with a different colour under the
// text.
wxColour oldColour = GetBackgroundColour();
- if (oldColour.Ok())
+ if (oldColour.IsOk())
{
// Need to set twice or it'll optimize the useful stuff out
if (oldColour == * wxWHITE)
void wxTextCtrl::MarkDirty()
{
- m_modified = TRUE;
+ m_modified = true;
}
void wxTextCtrl::DiscardEdits()
{
- m_modified = FALSE;
+ m_modified = false;
}
// ----------------------------------------------------------------------------
void wxTextCtrl::IgnoreNextTextUpdate()
{
- m_ignoreNextUpdate = TRUE;
+ m_ignoreNextUpdate = true;
}
bool wxTextCtrl::IgnoreTextUpdate()
{
if ( m_ignoreNextUpdate )
{
- m_ignoreNextUpdate = FALSE;
+ m_ignoreNextUpdate = false;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
void wxTextCtrl::SetMaxLength(unsigned long len)
if (from == -1 && to == -1)
{
from = 0;
- to = GetValue().Length();
+ to = GetValue().length();
}
-#ifndef __WXGTK20__
if ( (m_windowStyle & wxTE_MULTILINE) &&
!GTK_TEXT(m_text)->line_start_cache )
{
// tell the programmer that it didn't work
- wxLogDebug(_T("Can't call SetSelection() before realizing the control"));
+ wxLogDebug(wxT("Can't call SetSelection() before realizing the control"));
return;
}
-#endif
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- GtkTextBuffer *buf = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
- GtkTextIter fromi, toi;
- gtk_text_buffer_get_iter_at_offset( buf, &fromi, from );
- gtk_text_buffer_get_iter_at_offset( buf, &toi, to );
-
- gtk_text_buffer_place_cursor( buf, &toi );
- gtk_text_buffer_move_mark_by_name( buf, "selection_bound", &fromi );
-#else
gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
-#endif
}
else
{
{
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- GtkTextBuffer *buf = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
- GtkTextIter iter;
- gtk_text_buffer_get_start_iter( buf, &iter );
- gtk_text_iter_set_offset( &iter, pos );
- GtkTextMark *mark = gtk_text_buffer_create_mark( buf, NULL, &iter, TRUE );
- gtk_text_view_scroll_to_mark( GTK_TEXT_VIEW(m_text), mark, 0.0, FALSE, 0.0, 0.0 );
-#else // GTK 1.x
GtkAdjustment *vp = GTK_TEXT(m_text)->vadj;
float totalLines = (float) GetNumberOfLines();
long posX;
float posLine = (float) posY;
float p = (posLine/totalLines)*(vp->upper - vp->lower) + vp->lower;
gtk_adjustment_set_value(GTK_TEXT(m_text)->vadj, p);
-#endif // GTK 1.x/2.x
}
}
long wxTextCtrl::GetInsertionPoint() const
{
wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
-
-#ifdef __WXGTK20__
- if (m_windowStyle & wxTE_MULTILINE)
- {
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
- // There is no direct accessor for the cursor, but
- // internally, the cursor is the "mark" called
- // "insert" in the text view's btree structure.
-
- GtkTextMark *mark = gtk_text_buffer_get_insert( text_buffer );
- GtkTextIter cursor;
- gtk_text_buffer_get_iter_at_mark( text_buffer, &cursor, mark );
-
- return gtk_text_iter_get_offset( &cursor );
- }
- else
-#endif
- {
return (long) GET_EDITABLE_POS(m_text);
- }
}
-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const
{
wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
- GtkTextIter end;
- gtk_text_buffer_get_end_iter( text_buffer, &end );
-
- pos = gtk_text_iter_get_offset( &end );
-#else
pos = gtk_text_get_length( GTK_TEXT(m_text) );
-#endif
}
else
{
void wxTextCtrl::Remove( long from, long to )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-
-#ifdef __WXGTK20__
- if (m_windowStyle & wxTE_MULTILINE)
- {
- GtkTextBuffer *
- text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
-
- GtkTextIter fromi, toi;
- gtk_text_buffer_get_iter_at_offset( text_buffer, &fromi, from );
- gtk_text_buffer_get_iter_at_offset( text_buffer, &toi, to );
-
- gtk_text_buffer_delete( text_buffer, &fromi, &toi );
- }
- else // single line
-#endif
gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
}
Remove( from, to );
- if (!value.IsEmpty())
+ if (!value.empty())
{
-#ifdef __WXGTK20__
- SetInsertionPoint( from );
- WriteText( value );
-#else // GTK 1.x
gint pos = (gint)from;
#if wxUSE_UNICODE
wxWX2MBbuf buf = value.mbc_str();
gtk_editable_insert_text( GTK_EDITABLE(m_text), buf, strlen(buf), &pos );
#else
- gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.Length(), &pos );
+ gtk_editable_insert_text( GTK_EDITABLE(m_text), value, value.length(), &pos );
#endif // wxUSE_UNICODE
-#endif // GTK 1.x/2.x
}
}
void wxTextCtrl::Cut()
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
-
-#ifndef __WXGTK20__
- gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG );
-#endif
+ gtk_editable_cut_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
}
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 );
-#endif
+ gtk_editable_copy_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
}
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 );
-#endif
+ gtk_editable_paste_clipboard(GTK_EDITABLE(m_text) DUMMY_CLIPBOARD_ARG);
}
// Undo/redo
{
// TODO
//wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );
- return FALSE;
+ return false;
}
bool wxTextCtrl::CanRedo() const
{
// TODO
//wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );
- return FALSE;
+ return false;
}
// If the return values from and to are the same, there is no
gint from = -1;
gint to = -1;
- bool haveSelection = FALSE;
+ bool haveSelection = false;
-#ifdef __WXGTK20__
- if (m_windowStyle & wxTE_MULTILINE)
- {
- GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (m_text));
- GtkTextIter ifrom, ito;
- if ( gtk_text_buffer_get_selection_bounds(buffer, &ifrom, &ito) )
- {
- haveSelection = TRUE;
- from = gtk_text_iter_get_offset(&ifrom);
- to = gtk_text_iter_get_offset(&ito);
- }
- }
- else // not multi-line
- {
- if ( gtk_editable_get_selection_bounds( GTK_EDITABLE(m_text),
- &from, &to) )
- {
- haveSelection = TRUE;
- }
- }
-#else // not GTK2
if ( (GTK_EDITABLE(m_text)->has_selection) )
{
- haveSelection = TRUE;
+ haveSelection = true;
from = (long) GTK_EDITABLE(m_text)->selection_start_pos;
to = (long) GTK_EDITABLE(m_text)->selection_end_pos;
}
-#endif
if (! haveSelection )
from = to = GetInsertionPoint();
bool wxTextCtrl::IsEditable() const
{
- wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
-
-#ifdef __WXGTK20__
- if (m_windowStyle & wxTE_MULTILINE)
- {
- return gtk_text_view_get_editable(GTK_TEXT_VIEW(m_text));
- }
- else
- {
- return gtk_editable_get_editable(GTK_EDITABLE(m_text));
- }
-#else
+ wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
return GTK_EDITABLE(m_text)->editable;
-#endif
}
bool wxTextCtrl::IsModified() const
void wxTextCtrl::Clear()
{
- SetValue( wxT("") );
+ SetValue( wxEmptyString );
}
void wxTextCtrl::OnChar( wxKeyEvent &key_event )
{
wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );
- if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
+ if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER))
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
event.SetEventObject(this);
event.SetString(GetValue());
- if (GetEventHandler()->ProcessEvent(event)) return;
+ if (HandleWindowEvent(event)) return;
}
if ((key_event.GetKeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE))
{
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifdef __WXGTK20__
- return window == gtk_text_view_get_window( GTK_TEXT_VIEW( m_text ), GTK_TEXT_WINDOW_TEXT ); // pure guesswork
-#else
return (window == GTK_TEXT(m_text)->text_area);
-#endif
}
else
{
// the font will change for subsequent text insertiongs
bool wxTextCtrl::SetFont( const wxFont &font )
{
- wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
+ wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
if ( !wxTextCtrlBase::SetFont(font) )
{
// font didn't change, nothing to do
- return FALSE;
+ return false;
}
if ( m_windowStyle & wxTE_MULTILINE )
{
- m_updateFont = TRUE;
+ SetUpdateFont(true);
m_defaultStyle.SetFont(font);
ChangeFontGlobally();
}
- return TRUE;
+ return true;
}
void wxTextCtrl::ChangeFontGlobally()
// this method is very inefficient and hence should be called as rarely as
// possible!
wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
- _T("shouldn't be called for single line controls") );
+
+ wxT("shouldn't be called for single line controls") );
wxString value = GetValue();
- if ( !value.IsEmpty() )
+ if ( !value.empty() )
{
- m_updateFont = FALSE;
+ SetUpdateFont(false);
Clear();
AppendText(value);
bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
{
if ( !wxControl::SetForegroundColour(colour) )
- return FALSE;
+ return false;
// update default fg colour too
m_defaultStyle.SetTextColour(colour);
- return TRUE;
+ return true;
}
bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
{
- wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );
+ wxCHECK_MSG( m_text != NULL, false, wxT("invalid text ctrl") );
if ( !wxControl::SetBackgroundColour( colour ) )
- return FALSE;
+ return false;
if (!m_widget->window)
- return FALSE;
-
- wxColour sysbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
- if (sysbg.Red() == colour.Red() &&
- sysbg.Green() == colour.Green() &&
- sysbg.Blue() == colour.Blue())
- {
- return FALSE; // FIXME or TRUE?
- }
+ return false;
- if (!m_backgroundColour.Ok())
- return FALSE;
+ if (!m_backgroundColour.IsOk())
+ return false;
if (m_windowStyle & wxTE_MULTILINE)
{
-#ifndef __WXGTK20__
GdkWindow *window = GTK_TEXT(m_text)->text_area;
if (!window)
- return FALSE;
+ return false;
m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
gdk_window_set_background( window, m_backgroundColour.GetColor() );
gdk_window_clear( window );
-#endif
}
// change active background color too
m_defaultStyle.SetBackgroundColour( colour );
- return TRUE;
+ return true;
}
bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
if ( style.IsDefault() )
{
// nothing to do
- return TRUE;
+ return true;
}
-#ifdef __WXGTK20__
- GtkTextBuffer *text_buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(m_text) );
- gint l = gtk_text_buffer_get_char_count( text_buffer );
-
- wxCHECK_MSG( start >= 0 && end <= l, FALSE,
- _T("invalid range in wxTextCtrl::SetStyle") );
-
- GtkTextIter starti, endi;
- gtk_text_buffer_get_iter_at_offset( text_buffer, &starti, start );
- gtk_text_buffer_get_iter_at_offset( text_buffer, &endi, end );
-
- // use the attributes from style which are set in it and fall back
- // first to the default style and then to the text control default
- // colours for the others
- wxTextAttr attr = wxTextAttr::Combine(style, m_defaultStyle, this);
-
- PangoFontDescription *font_description = attr.HasFont()
- ? attr.GetFont().GetNativeFontInfo()->description
- : NULL;
-
- GdkColor *colFg = attr.HasTextColour() ? attr.GetTextColour().GetColor()
- : NULL;
-
- GdkColor *colBg = attr.HasBackgroundColour()
- ? attr.GetBackgroundColour().GetColor()
- : NULL;
- GtkTextTag *tag;
- tag = gtk_text_buffer_create_tag( text_buffer, NULL, "font-desc", font_description,
- "foreground-gdk", colFg,
- "background-gdk", colBg, NULL );
- gtk_text_buffer_apply_tag( text_buffer, tag, &starti, &endi );
-
- return TRUE;
-#else
// VERY dirty way to do that - removes the required text and re-adds it
// with styling (FIXME)
gint l = gtk_text_get_length( GTK_TEXT(m_text) );
- wxCHECK_MSG( start >= 0 && end <= l, FALSE,
- _T("invalid range in wxTextCtrl::SetStyle") );
+ wxCHECK_MSG( start >= 0 && end <= l, false,
+ wxT("invalid range in wxTextCtrl::SetStyle") );
gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) );
char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), start, end );
gtk_editable_delete_text( GTK_EDITABLE(m_text), start, end );
gtk_editable_set_position( GTK_EDITABLE(m_text), start );
-#if wxUSE_UNICODE
+ #if wxUSE_UNICODE
wxWX2MBbuf buf = tmp.mbc_str();
const char *txt = buf;
size_t txtlen = strlen(buf);
-#else
+ #else
const char *txt = tmp;
size_t txtlen = tmp.length();
-#endif
+ #endif
// use the attributes from style which are set in it and fall back
// first to the default style and then to the text control default
/* does not seem to help under GTK+ 1.2 !!!
gtk_editable_set_position( GTK_EDITABLE(m_text), old_pos ); */
SetInsertionPoint( old_pos );
-#endif
- return TRUE;
- }
- else // singe line
- {
- // cannot do this for GTK+'s Entry widget
- return FALSE;
+
+ return true;
}
+
+ // else single line
+ // cannot do this for GTK+'s Entry widget
+ return false;
}
-void wxTextCtrl::ApplyWidgetStyle()
+void wxTextCtrl::DoApplyWidgetStyle(GtkRcStyle *style)
{
- if (m_windowStyle & wxTE_MULTILINE)
- {
- // how ?
- }
- else
- {
- SetWidgetStyle();
- gtk_widget_set_style( m_text, m_widgetStyle );
- }
+ gtk_widget_modify_style(m_text, style);
}
void wxTextCtrl::OnCut(wxCommandEvent& WXUNUSED(event))
void wxTextCtrl::OnInternalIdle()
{
wxCursor cursor = m_cursor;
- if (g_globalCursor.Ok()) cursor = g_globalCursor;
+ if (g_globalCursor.IsOk()) cursor = g_globalCursor;
- if (cursor.Ok())
+ if (cursor.IsOk())
{
-#ifndef __WXGTK20__
- GdkWindow *window = (GdkWindow*) NULL;
+ GdkWindow *window = NULL;
if (HasFlag(wxTE_MULTILINE))
window = GTK_TEXT(m_text)->text_area;
else
if (window)
gdk_window_set_cursor( window, cursor.GetCursor() );
- if (!g_globalCursor.Ok())
+ if (!g_globalCursor.IsOk())
cursor = *wxSTANDARD_CURSOR;
window = m_widget->window;
if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
gdk_window_set_cursor( window, cursor.GetCursor() );
-#endif
}
if (g_delayedFocus == this)
{
// FIXME should be different for multi-line controls...
wxSize ret( wxControl::DoGetBestSize() );
- return wxSize(80, ret.y);
+ wxSize best(80, ret.y);
+ CacheBestSize(best);
+ return best;
}
// ----------------------------------------------------------------------------
// freeze/thaw
// ----------------------------------------------------------------------------
-void wxTextCtrl::Freeze()
+void wxTextCtrl::DoFreeze()
{
-#ifndef __WXGTK20__
if ( HasFlag(wxTE_MULTILINE) )
{
gtk_text_freeze(GTK_TEXT(m_text));
}
-#endif
}
-void wxTextCtrl::Thaw()
+void wxTextCtrl::DoThaw()
{
-#ifndef __WXGTK20__
if ( HasFlag(wxTE_MULTILINE) )
{
GTK_TEXT(m_text)->vadj->value = 0.0;
gtk_text_thaw(GTK_TEXT(m_text));
}
-#endif
}
// ----------------------------------------------------------------------------
GtkAdjustment *wxTextCtrl::GetVAdj() const
{
-#ifdef __WXGTK20__
- return NULL;
-#else
- return HasFlag(wxTE_MULTILINE) ? GTK_TEXT(m_text)->vadj : NULL;
-#endif
+ if ( !IsMultiLine() )
+ return NULL;
+
+ return GTK_TEXT(m_text)->vadj;
}
bool wxTextCtrl::DoScroll(GtkAdjustment *adj, int diff)
{
-#ifndef __WXGTK20__
float value = adj->value + diff;
if ( value < 0 )
if ( fabs(adj->value - value) < 0.2 )
{
// well, this is what Robert does in wxScrollBar, so it must be good...
- return FALSE;
+ return false;
}
adj->value = value;
-
gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed");
-#endif
- return TRUE;
+ return true;
}
bool wxTextCtrl::ScrollLines(int lines)
{
-#ifdef __WXGTK20__
- return FALSE;
-#else
GtkAdjustment *adj = GetVAdj();
if ( !adj )
- return FALSE;
+ return false;
// this is hardcoded to 10 in GTK+ 1.2 (great idea)
- static const int KEY_SCROLL_PIXELS = 10;
+ int diff = 10*lines;
- return DoScroll(adj, lines*KEY_SCROLL_PIXELS);
-#endif
+ return DoScroll(adj, diff);
}
bool wxTextCtrl::ScrollPages(int pages)
{
-#ifdef __WXGTK20__
- return FALSE;
-#else
GtkAdjustment *adj = GetVAdj();
if ( !adj )
- return FALSE;
+ return false;
return DoScroll(adj, (int)ceil(pages*adj->page_increment));
-#endif
}
+
+// static
+wxVisualAttributes
+wxTextCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+ return GetDefaultAttributesFromGTKWidget(gtk_entry_new, true);
+}
projects / wxWidgets.git / blobdiff