VTK wrapper of vtkRenderWindow for wxPython. Tested on MSW so far.

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index db100d48ec8bf4443693acb529fcced399682b18..fd5d34bc5876ed0708d4778c0556e2c221561cac 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -567,7 +567,7 @@ void wxTextCtrl::SetInsertionPoint( long pos )
 
         /* bring editable's cursor uptodate. bug in GTK. */
 
 
         /* bring editable's cursor uptodate. bug in GTK. */
 

-        GTK_EDITABLE(m_text)->current_pos = pos;
+        GTK_EDITABLE(m_text)->current_pos = (guint32)pos;

     }
 }
 
     }
 }
 


@@ -779,6 +779,20 @@ void wxTextCtrl::OnChar( wxKeyEvent &key_event )
         if (GetEventHandler()->ProcessEvent(event)) return;
     }
 
         if (GetEventHandler()->ProcessEvent(event)) return;
     }
 

+    if ((key_event.KeyCode() == WXK_RETURN) && !(m_windowStyle & wxTE_MULTILINE))
+    {
+        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)
+        {
+            gtk_widget_activate (window->default_widget);
+           return;
+       }
+    }
+

     key_event.Skip();
 }
 
     key_event.Skip();
 }
 


@@ -931,10 +945,8 @@ void wxTextCtrl::OnInternalIdle()
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 
     wxCursor cursor = m_cursor;
     if (g_globalCursor.Ok()) cursor = g_globalCursor;
 

-    if (cursor.Ok() && m_currentGdkCursor != cursor)
+    if (cursor.Ok())

     {
     {

-        m_currentGdkCursor = cursor;
-       

         GdkWindow *window = (GdkWindow*) NULL;
        if (HasFlag(wxTE_MULTILINE))
             window = GTK_TEXT(m_text)->text_area;
         GdkWindow *window = (GdkWindow*) NULL;
        if (HasFlag(wxTE_MULTILINE))
             window = GTK_TEXT(m_text)->text_area;


@@ -948,7 +960,9 @@ void wxTextCtrl::OnInternalIdle()
             cursor = *wxSTANDARD_CURSOR;
 
         window = m_widget->window;
             cursor = *wxSTANDARD_CURSOR;
 
         window = m_widget->window;

-        if (window)
+        if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))

             gdk_window_set_cursor( window, cursor.GetCursor() );
     }
             gdk_window_set_cursor( window, cursor.GetCursor() );
     }

+
+    UpdateWindowUI();

 }
 }