Call base OnInternalIdle

Use wxUniv textctrl implementation in wxX11

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 2dd4196a92e6b2b45971b6432841b76b0a325e49..0f1706da59df35ce10474c9868b045e58a29f77b 100644 (file)
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -11,6 +11,14 @@
 #ifndef __X11TEXTCTRLH__
 #define __X11TEXTCTRLH__
 
+// Set to 1 to use wxUniv's implementation, 0
+// to use wxX11's.
+#define wxUSE_UNIV_TEXTCTRL 1
+
+#if wxUSE_UNIV_TEXTCTRL
+#include "wx/univ/textctrl.h"
+#else
+
 #if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "textctrl.h"
 #endif
@@ -385,5 +393,8 @@ protected:
     wxTextCtrl *m_winCapture;
 };
 
-#endif // __GTKTEXTCTRLH__
+#endif
+// wxUSE_UNIV_TEXTCTRL
+
+#endif // __X11TEXTCTRLH__
 

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index f209017f864932477415b67292b7d02af3c6f416..78e4f2a3cca116eb984e213b41030645e1e42470 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -2443,7 +2443,7 @@ void wxTextCtrl::UpdateLastVisible()
     SData().m_colLastVisible += SData().m_colStart;
 
     wxLogTrace(_T("text"), _T("Last visible column/position is %d/%ld"),
-               SData().m_colLastVisible, SData().m_posLastVisible);
+               (int) SData().m_colLastVisible, (long) SData().m_posLastVisible);
 }
 
 void wxTextCtrl::OnSize(wxSizeEvent& event)
@@ -3577,6 +3577,7 @@ void wxTextCtrl::OnInternalIdle()
     {
         UpdateScrollbars();
     }
+    wxControl::OnInternalIdle();
 }
 
 bool wxTextCtrl::SendAutoScrollEvents(wxScrollWinEvent& event) const

diff --git a/src/x11/textctrl.cpp b/src/x11/textctrl.cpp
index 9f69ec1a2105ca416ec3b9854739fb183adee73b..4fb30cedccef366642afce6d2f87a0f3cff9d421 100644 (file)
--- a/src/x11/textctrl.cpp
+++ b/src/x11/textctrl.cpp
@@ -12,6 +12,7 @@
 #endif
 
 #include "wx/textctrl.h"
+
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/log.h"
@@ -1963,6 +1964,8 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
 
 void wxTextCtrl::OnInternalIdle()
 {
+    wxControl::OnInternalIdle();
+    
     m_ignoreInput = FALSE;
     
     if (m_lang != wxSOURCE_LANG_NONE)