missing commit

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

diff --git a/src/gtk1/textctrl.cpp b/src/gtk1/textctrl.cpp
index c2c52adef72fc7f341bc66c64c0ff68ed52d7a79..41e10d05266ce943518eaea7f5bdc0a9b9028a02 100644 (file)
--- a/src/gtk1/textctrl.cpp
+++ b/src/gtk1/textctrl.cpp
@@ -24,6 +24,7 @@
 
 #include "wx/strconv.h"
 #include "wx/fontutil.h"        // for wxNativeFontInfo (GetNativeFontInfo())
 
 #include "wx/strconv.h"
 #include "wx/fontutil.h"        // for wxNativeFontInfo (GetNativeFontInfo())

+#include "wx/evtloop.h"

 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>


@@ -101,7 +102,7 @@ gtk_insert_text_callback(GtkEditable *editable,
     // we should only be called if we have a max len limit at all
     GtkEntry *entry = GTK_ENTRY (editable);
 
     // 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
     //
 
     // check that we don't overflow the max length limit
     //


@@ -113,11 +114,11 @@ gtk_insert_text_callback(GtkEditable *editable,
         gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");
 
         // remember that the next changed signal is to be ignored to avoid
         gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");
 
         // remember that the next changed signal is to be ignored to avoid

-        // generating a dummy wxEVT_COMMAND_TEXT_UPDATED event
+        // generating a dummy wxEVT_TEXT event

         win->IgnoreNextTextUpdate();
 
         // and generate the correct one ourselves
         win->IgnoreNextTextUpdate();
 
         // and generate the correct one ourselves

-        wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, win->GetId());
+        wxCommandEvent event(wxEVT_TEXT_MAXLEN, win->GetId());

         event.SetEventObject(win);
         event.SetString(win->GetValue());
         win->HandleWindowEvent( event );
         event.SetEventObject(win);
         event.SetString(win->GetValue());
         win->HandleWindowEvent( event );


@@ -144,7 +145,7 @@ gtk_text_changed_callback( GtkWidget *WXUNUSED(widget), wxTextCtrl *win )
     win->SetModified();
     win->UpdateFontIfNeeded();
 
     win->SetModified();
     win->UpdateFontIfNeeded();
 

-    wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, win->GetId() );
+    wxCommandEvent event( wxEVT_TEXT, win->GetId() );

     event.SetEventObject( win );
     win->HandleWindowEvent( event );
 }
     event.SetEventObject( win );
     win->HandleWindowEvent( event );
 }


@@ -185,10 +186,11 @@ static GtkDrawCallback gs_gtk_text_draw = NULL;
 extern "C" {
 static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
 {
 extern "C" {
 static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
 {

-    if ( !wxTheApp->IsYielding() )
+    wxEventLoopBase* loop = wxEventLoopBase::GetActive();
+    if ( loop && !loop->IsYielding() )

     {
         wxCHECK_RET( gs_gtk_text_draw != wxgtk_text_draw,
     {
         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);
     }
 
         gs_gtk_text_draw(widget, rect);
     }


@@ -199,8 +201,6 @@ static void wxgtk_text_draw( GtkWidget *widget, GdkRectangle *rect)
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-

 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
 
 BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
     EVT_CHAR(wxTextCtrl::OnChar)
 


@@ -223,7 +223,7 @@ void wxTextCtrl::Init()
     m_modified = false;
     SetUpdateFont(false);
     m_text =
     m_modified = false;
     SetUpdateFont(false);
     m_text =

-    m_vScrollbar = (GtkWidget *)NULL;
+    m_vScrollbar = NULL;

 }
 
 wxTextCtrl::~wxTextCtrl()
 }
 
 wxTextCtrl::~wxTextCtrl()


@@ -271,7 +271,7 @@ bool wxTextCtrl::Create( wxWindow *parent,
     if (multi_line)
     {
         // create our control ...
     if (multi_line)
     {
         // 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;
 
         // ... and put into the upper left hand corner of the table
         bool bHasHScrollbar = false;


@@ -404,7 +404,7 @@ void wxTextCtrl::CalculateScrollbar()
     }
 }
 
     }
 }
 

-wxString wxTextCtrl::GetValue() const
+wxString wxTextCtrl::DoGetValue() const

 {
     wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
 
 {
     wxCHECK_MSG( m_text != NULL, wxEmptyString, wxT("invalid text ctrl") );
 


@@ -714,29 +714,6 @@ void wxTextCtrl::DoEnable( bool enable )
     }
 }
 
     }
 }
 

-// wxGTK-specific: called recursively by Enable,
-// to give widgets an oppprtunity to correct their colours after they
-// have been changed by 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())
-    {
-        // Need to set twice or it'll optimize the useful stuff out
-        if (oldColour == * wxWHITE)
-            SetBackgroundColour(*wxBLACK);
-        else
-            SetBackgroundColour(*wxWHITE);
-        SetBackgroundColour(oldColour);
-    }
-}
-

 void wxTextCtrl::MarkDirty()
 {
     m_modified = true;
 void wxTextCtrl::MarkDirty()
 {
     m_modified = true;


@@ -816,7 +793,7 @@ void wxTextCtrl::SetSelection( long from, long to )
          !GTK_TEXT(m_text)->line_start_cache )
     {
         // tell the programmer that it didn't work
          !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;
     }
 
         return;
     }
 


@@ -995,7 +972,7 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 
     if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER))
     {
 
     if ((key_event.GetKeyCode() == WXK_RETURN) && (m_windowStyle & wxTE_PROCESS_ENTER))
     {

-        wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+        wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);

         event.SetEventObject(this);
         event.SetString(GetValue());
         if (HandleWindowEvent(event)) return;
         event.SetEventObject(this);
         event.SetString(GetValue());
         if (HandleWindowEvent(event)) return;


@@ -1071,7 +1048,7 @@ void wxTextCtrl::ChangeFontGlobally()
     // possible!
     wxASSERT_MSG( (m_windowStyle & wxTE_MULTILINE) && m_updateFont,
 
     // 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.empty() )
 
     wxString value = GetValue();
     if ( !value.empty() )


@@ -1110,7 +1087,7 @@ bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
     if (!m_widget->window)
         return false;
 
     if (!m_widget->window)
         return false;
 

-    if (!m_backgroundColour.Ok())
+    if (!m_backgroundColour.IsOk())

         return false;
 
     if (m_windowStyle & wxTE_MULTILINE)
         return false;
 
     if (m_windowStyle & wxTE_MULTILINE)


@@ -1145,7 +1122,7 @@ bool wxTextCtrl::SetStyle( long start, long end, const wxTextAttr& style )
         gint l = gtk_text_get_length( GTK_TEXT(m_text) );
 
         wxCHECK_MSG( start >= 0 && end <= l, false,
         gint l = gtk_text_get_length( GTK_TEXT(m_text) );
 
         wxCHECK_MSG( start >= 0 && end <= l, false,

-                     _T("invalid range in wxTextCtrl::SetStyle") );
+                     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 );
 
         gint old_pos = gtk_editable_get_position( GTK_EDITABLE(m_text) );
         char *text = gtk_editable_get_chars( GTK_EDITABLE(m_text), start, end );


@@ -1242,11 +1219,11 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
 void wxTextCtrl::OnInternalIdle()
 {
     wxCursor cursor = m_cursor;
 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())

     {
     {

-        GdkWindow *window = (GdkWindow*) NULL;
+        GdkWindow *window = NULL;

         if (HasFlag(wxTE_MULTILINE))
             window = GTK_TEXT(m_text)->text_area;
         else
         if (HasFlag(wxTE_MULTILINE))
             window = GTK_TEXT(m_text)->text_area;
         else


@@ -1255,7 +1232,7 @@ void wxTextCtrl::OnInternalIdle()
         if (window)
             gdk_window_set_cursor( window, cursor.GetCursor() );
 
         if (window)
             gdk_window_set_cursor( window, cursor.GetCursor() );
 

-        if (!g_globalCursor.Ok())
+        if (!g_globalCursor.IsOk())

             cursor = *wxSTANDARD_CURSOR;
 
         window = m_widget->window;
             cursor = *wxSTANDARD_CURSOR;
 
         window = m_widget->window;