AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Call base OnInternalIdle

Browse Source 
Use wxUniv textctrl implementation in wxX11


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2003-08-08 19:39:16 +00:00
parent 5a5797ca1f
commit 47cd661014
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/x11/textctrl.h
View File

@ -11,6 +11,14 @@
#ifndef __X11TEXTCTRLH__ #ifndef __X11TEXTCTRLH__
#define __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__) #if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "textctrl.h" #pragma interface "textctrl.h"
#endif #endif
@ -385,5 +393,8 @@ protected:
wxTextCtrl *m_winCapture; wxTextCtrl *m_winCapture;
}; };
#endif // __GTKTEXTCTRLH__ #endif
// wxUSE_UNIV_TEXTCTRL
#endif // __X11TEXTCTRLH__

3
src/univ/textctrl.cpp
View File

@ -2443,7 +2443,7 @@ void wxTextCtrl::UpdateLastVisible()
SData().m_colLastVisible += SData().m_colStart; SData().m_colLastVisible += SData().m_colStart;
wxLogTrace(_T("text"), _T("Last visible column/position is %d/%ld"), 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) void wxTextCtrl::OnSize(wxSizeEvent& event)
@ -3577,6 +3577,7 @@ void wxTextCtrl::OnInternalIdle()
{ {
UpdateScrollbars(); UpdateScrollbars();
} }
wxControl::OnInternalIdle();
} }
bool wxTextCtrl::SendAutoScrollEvents(wxScrollWinEvent& event) const bool wxTextCtrl::SendAutoScrollEvents(wxScrollWinEvent& event) const

3
src/x11/textctrl.cpp
View File

@ -12,6 +12,7 @@
#endif #endif
#include "wx/textctrl.h" #include "wx/textctrl.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
@ -1963,6 +1964,8 @@ void wxTextCtrl::OnChar( wxKeyEvent &event )
void wxTextCtrl::OnInternalIdle() void wxTextCtrl::OnInternalIdle()
{ {
wxControl::OnInternalIdle();
m_ignoreInput = FALSE; m_ignoreInput = FALSE;
if (m_lang != wxSOURCE_LANG_NONE) if (m_lang != wxSOURCE_LANG_NONE)