Sombody committed this with a hard-coded pathname for WXDIR. Fixed.

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

diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp
index 1e4d3a3ceb55acb490ba970f9f4150b12b166c94..ec0d15875c183cf529f981bdf8e3bbbcba0ee8c2 100644 (file)
--- a/src/gtk/textctrl.cpp
+++ b/src/gtk/textctrl.cpp
@@ -118,7 +118,7 @@ bool wxTextCtrl::Create( wxWindow *parent, wxWindowID id, const wxString &value,
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {

-        wxFAIL_MSG( T("wxTextCtrl creation failed") );
+        wxFAIL_MSG( wxT("wxTextCtrl creation failed") );

        return FALSE;
     }
 
        return FALSE;
     }
 


@@ -282,7 +282,7 @@ void wxTextCtrl::CalculateScrollbar()
 
 wxString wxTextCtrl::GetValue() const
 {
 
 wxString wxTextCtrl::GetValue() const
 {

-    wxCHECK_MSG( m_text != NULL, T(""), T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, wxT(""), wxT("invalid text ctrl") );

 
     wxString tmp;
     if (m_windowStyle & wxTE_MULTILINE)
 
     wxString tmp;
     if (m_windowStyle & wxTE_MULTILINE)


@@ -301,9 +301,9 @@ wxString wxTextCtrl::GetValue() const
 
 void wxTextCtrl::SetValue( const wxString &value )
 {
 
 void wxTextCtrl::SetValue( const wxString &value )
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
 

-    wxString tmp = T("");
+    wxString tmp = wxT("");

     if (!value.IsNull()) tmp = value;
     if (m_windowStyle & wxTE_MULTILINE)
     {
     if (!value.IsNull()) tmp = value;
     if (m_windowStyle & wxTE_MULTILINE)
     {


@@ -325,7 +325,7 @@ void wxTextCtrl::SetValue( const wxString &value )
 
 void wxTextCtrl::WriteText( const wxString &text )
 {
 
 void wxTextCtrl::WriteText( const wxString &text )
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
     if (text.IsEmpty()) return;
 
 
     if (text.IsEmpty()) return;
 


@@ -365,7 +365,7 @@ void wxTextCtrl::WriteText( const wxString &text )
 
 void wxTextCtrl::AppendText( const wxString &text )
 {
 
 void wxTextCtrl::AppendText( const wxString &text )
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
     if (text.IsEmpty()) return;
 
 
     if (text.IsEmpty()) return;
 


@@ -413,7 +413,7 @@ wxString wxTextCtrl::GetLineText( long lineNo ) const
 
     if (text)
     {
 
     if (text)
     {

-        wxString buf(T(""));
+        wxString buf(wxT(""));

         long i;
         int currentLine = 0;
         for (i = 0; currentLine != lineNo && text[i]; i++ )
         long i;
         int currentLine = 0;
         for (i = 0; currentLine != lineNo && text[i]; i++ )


@@ -441,7 +441,7 @@ void wxTextCtrl::OnDropFiles( wxDropFilesEvent &WXUNUSED(event) )
 {
   /* If you implement this, don't forget to update the documentation!
    * (file docs/latex/wx/text.tex) */
 {
   /* If you implement this, don't forget to update the documentation!
    * (file docs/latex/wx/text.tex) */

-    wxFAIL_MSG( T("wxTextCtrl::OnDropFiles not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::OnDropFiles not implemented") );

 }
 
 bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
 }
 
 bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const


@@ -460,7 +460,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y ) const
         const wxChar* stop = text.c_str() + pos;
         for ( const wxChar *p = text.c_str(); p < stop; p++ )
         {
         const wxChar* stop = text.c_str() + pos;
         for ( const wxChar *p = text.c_str(); p < stop; p++ )
         {

-            if (*p == T('\n'))
+            if (*p == wxT('\n'))

             {
                 (*y)++;
                 *x=0;
             {
                 (*y)++;
                 *x=0;


@@ -536,7 +536,7 @@ int wxTextCtrl::GetNumberOfLines() const
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {
 
 void wxTextCtrl::SetInsertionPoint( long pos )
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 
     if (m_windowStyle & wxTE_MULTILINE)
     {


@@ -567,13 +567,13 @@ 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;

     }
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
     }
 }
 
 void wxTextCtrl::SetInsertionPointEnd()
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
     if (m_windowStyle & wxTE_MULTILINE)
         SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));
 
     if (m_windowStyle & wxTE_MULTILINE)
         SetInsertionPoint(gtk_text_get_length(GTK_TEXT(m_text)));


@@ -583,7 +583,7 @@ void wxTextCtrl::SetInsertionPointEnd()
 
 void wxTextCtrl::SetEditable( bool editable )
 {
 
 void wxTextCtrl::SetEditable( bool editable )
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
     if (m_windowStyle & wxTE_MULTILINE)
         gtk_text_set_editable( GTK_TEXT(m_text), editable );
 
     if (m_windowStyle & wxTE_MULTILINE)
         gtk_text_set_editable( GTK_TEXT(m_text), editable );


@@ -598,7 +598,7 @@ void wxTextCtrl::DiscardEdits()
 
 void wxTextCtrl::SetSelection( long from, long to )
 {
 
 void wxTextCtrl::SetSelection( long from, long to )
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
     gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 
     gtk_editable_select_region( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }


@@ -610,14 +610,14 @@ void wxTextCtrl::ShowPosition( long WXUNUSED(pos) )
 
 long wxTextCtrl::GetInsertionPoint() const
 {
 
 long wxTextCtrl::GetInsertionPoint() const
 {

-    wxCHECK_MSG( m_text != NULL, 0, T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );

 
     return (long) GTK_EDITABLE(m_text)->current_pos;
 }
 
 long wxTextCtrl::GetLastPosition() const
 {
 
     return (long) GTK_EDITABLE(m_text)->current_pos;
 }
 
 long wxTextCtrl::GetLastPosition() const
 {

-    wxCHECK_MSG( m_text != NULL, 0, T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, 0, wxT("invalid text ctrl") );

 
     int pos = 0;
     if (m_windowStyle & wxTE_MULTILINE)
 
     int pos = 0;
     if (m_windowStyle & wxTE_MULTILINE)


@@ -630,14 +630,14 @@ long wxTextCtrl::GetLastPosition() const
 
 void wxTextCtrl::Remove( long from, long to )
 {
 
 void wxTextCtrl::Remove( long from, long to )
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 
 void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {
 
     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 }
 
 void wxTextCtrl::Replace( long from, long to, const wxString &value )
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 
 
     gtk_editable_delete_text( GTK_EDITABLE(m_text), (gint)from, (gint)to );
 


@@ -655,7 +655,7 @@ void wxTextCtrl::Replace( long from, long to, const wxString &value )
 
 void wxTextCtrl::Cut()
 {
 
 void wxTextCtrl::Cut()
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );
 
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_cut_clipboard( GTK_EDITABLE(m_text) );


@@ -666,7 +666,7 @@ void wxTextCtrl::Cut()
 
 void wxTextCtrl::Copy()
 {
 
 void wxTextCtrl::Copy()
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );
 
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_copy_clipboard( GTK_EDITABLE(m_text) );


@@ -677,7 +677,7 @@ void wxTextCtrl::Copy()
 
 void wxTextCtrl::Paste()
 {
 
 void wxTextCtrl::Paste()
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );
 
 #if (GTK_MINOR_VERSION > 0)
     gtk_editable_paste_clipboard( GTK_EDITABLE(m_text) );


@@ -711,26 +711,26 @@ bool wxTextCtrl::CanPaste() const
 void wxTextCtrl::Undo()
 {
     // TODO
 void wxTextCtrl::Undo()
 {
     // TODO

-    wxFAIL_MSG( T("wxTextCtrl::Undo not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::Undo not implemented") );

 }
 
 void wxTextCtrl::Redo()
 {
     // TODO
 }
 
 void wxTextCtrl::Redo()
 {
     // TODO

-    wxFAIL_MSG( T("wxTextCtrl::Redo not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::Redo not implemented") );

 }
 
 bool wxTextCtrl::CanUndo() const
 {
     // TODO
 }
 
 bool wxTextCtrl::CanUndo() const
 {
     // TODO

-    wxFAIL_MSG( T("wxTextCtrl::CanUndo not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::CanUndo not implemented") );

     return FALSE;
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO
     return FALSE;
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // TODO

-    wxFAIL_MSG( T("wxTextCtrl::CanRedo not implemented") );
+    wxFAIL_MSG( wxT("wxTextCtrl::CanRedo not implemented") );

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -738,7 +738,7 @@ bool wxTextCtrl::CanRedo() const
 // selection.
 void wxTextCtrl::GetSelection(long* from, long* to) const
 {
 // selection.
 void wxTextCtrl::GetSelection(long* from, long* to) const
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
     if (!(GTK_EDITABLE(m_text)->has_selection))
     {
 
     if (!(GTK_EDITABLE(m_text)->has_selection))
     {


@@ -753,7 +753,7 @@ void wxTextCtrl::GetSelection(long* from, long* to) const
 
 bool wxTextCtrl::IsEditable() const
 {
 
 bool wxTextCtrl::IsEditable() const
 {

-    wxCHECK_MSG( m_text != NULL, FALSE, T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );

 
     return GTK_EDITABLE(m_text)->editable;
 }
 
     return GTK_EDITABLE(m_text)->editable;
 }


@@ -765,12 +765,12 @@ bool wxTextCtrl::IsModified() const
 
 void wxTextCtrl::Clear()
 {
 
 void wxTextCtrl::Clear()
 {

-    SetValue( T("") );
+    SetValue( wxT("") );

 }
 
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {
 }
 
 void wxTextCtrl::OnChar( wxKeyEvent &key_event )
 {

-    wxCHECK_RET( m_text != NULL, T("invalid text ctrl") );
+    wxCHECK_RET( m_text != NULL, wxT("invalid text ctrl") );

 
     if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
     {
 
     if ((key_event.KeyCode() == WXK_RETURN) && (m_windowStyle & wxPROCESS_ENTER))
     {


@@ -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();
 }
 


@@ -798,7 +812,7 @@ bool wxTextCtrl::IsOwnGtkWindow( GdkWindow *window )
 // the font will change for subsequent text insertiongs
 bool wxTextCtrl::SetFont( const wxFont &font )
 {
 // the font will change for subsequent text insertiongs
 bool wxTextCtrl::SetFont( const wxFont &font )
 {

-    wxCHECK_MSG( m_text != NULL, FALSE, T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );

 
     if ( !wxWindowBase::SetFont(font) )
     {
 
     if ( !wxWindowBase::SetFont(font) )
     {


@@ -824,7 +838,7 @@ bool wxTextCtrl::SetFont( const wxFont &font )
 
 bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
 {
 
 bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
 {

-    wxCHECK_MSG( m_text != NULL, FALSE, T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );

 
     // doesn't work
     return FALSE;
 
     // doesn't work
     return FALSE;


@@ -832,7 +846,7 @@ bool wxTextCtrl::SetForegroundColour( const wxColour &WXUNUSED(colour) )
 
 bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {
 
 bool wxTextCtrl::SetBackgroundColour( const wxColour &colour )
 {

-    wxCHECK_MSG( m_text != NULL, FALSE, T("invalid text ctrl") );
+    wxCHECK_MSG( m_text != NULL, FALSE, wxT("invalid text ctrl") );

 
     wxControl::SetBackgroundColour( colour );
 
 
     wxControl::SetBackgroundColour( colour );
 


@@ -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,7 @@ 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() );
     }
 }