rtti api mods added

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

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index 7381cfef0f7678bb1c60f652d6ec0b51e4b5b1fd..84b9ae0290e46edfaedf7dce324c5243f2a28d04 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -7,11 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "textctrl.h"
 #endif
 
 #include "wx/textctrl.h"
 #pragma implementation "textctrl.h"
 #endif
 
 #include "wx/textctrl.h"

+

 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"


@@ -135,7 +136,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_MOUSE_EVENTS(wxTextCtrl::OnMouse)
     EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
     EVT_CHAR(wxTextCtrl::OnChar)
     EVT_MOUSE_EVENTS(wxTextCtrl::OnMouse)

-    EVT_IDLE(wxTextCtrl::OnIdle)

     EVT_KILL_FOCUS(wxTextCtrl::OnKillFocus)
     EVT_SET_FOCUS(wxTextCtrl::OnSetFocus)
     
     EVT_KILL_FOCUS(wxTextCtrl::OnKillFocus)
     EVT_SET_FOCUS(wxTextCtrl::OnSetFocus)
     


@@ -1962,14 +1962,14 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
     event.Skip();
 }
 
     event.Skip();
 }
 

-void wxTextCtrl::OnIdle( wxIdleEvent &event )
+void wxTextCtrl::OnInternalIdle()

 {
 {

+    wxControl::OnInternalIdle();
+    

     m_ignoreInput = FALSE;
     
     if (m_lang != wxSOURCE_LANG_NONE)
         SearchForBrackets();
     m_ignoreInput = FALSE;
     
     if (m_lang != wxSOURCE_LANG_NONE)
         SearchForBrackets();

-    
-    event.Skip( TRUE );

 }
 
 void wxTextCtrl::Indent()
 }
 
 void wxTextCtrl::Indent()