projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let wxMSW report wxDataViewCustomRenderer::LeftClick() report the click position...
[wxWidgets.git]
/
src
/
x11
/
textctrl.cpp
diff --git
a/src/x11/textctrl.cpp
b/src/x11/textctrl.cpp
index fc3a12b2fbf369162e618f21e2fa97730d207814..9cb89389452c2c63092f567b721bb20516ff7f28 100644
(file)
--- a/
src/x11/textctrl.cpp
+++ b/
src/x11/textctrl.cpp
@@
-14,15
+14,15
@@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/panel.h"
+ #include "wx/dcclient.h"
+ #include "wx/settings.h"
#endif
#endif
-#include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/settings.h"
-#include "wx/panel.h"
#include "wx/clipbrd.h"
#include "wx/tokenzr.h"
#include "wx/clipbrd.h"
#include "wx/tokenzr.h"
-#include "wx/dcclient.h"
#include "wx/univ/inphand.h"
#include "wx/univ/renderer.h"
#include "wx/univ/inphand.h"
#include "wx/univ/renderer.h"
@@
-131,9
+131,9
@@
WX_DEFINE_OBJARRAY(wxSourceLineArray);
// wxTextCtrl
//-----------------------------------------------------------------------------
// wxTextCtrl
//-----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,
wxControl
)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl,
wxTextCtrlBase
)
-BEGIN_EVENT_TABLE(wxTextCtrl, wx
Control
)
+BEGIN_EVENT_TABLE(wxTextCtrl, wx
TextCtrlBase
)
EVT_PAINT(wxTextCtrl::OnPaint)
EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_PAINT(wxTextCtrl::OnPaint)
EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
EVT_CHAR(wxTextCtrl::OnChar)
@@
-277,7
+277,7
@@
wxString wxTextCtrl::GetValue() const
return ret;
}
return ret;
}
-void wxTextCtrl::
SetValue(const wxString& value
)
+void wxTextCtrl::
DoSetValue(const wxString& value, int flags
)
{
m_modified = false;
{
m_modified = false;
@@
-343,6
+343,9
@@
void wxTextCtrl::SetValue(const wxString& value)
MyAdjustScrollbars();
Refresh();
MyAdjustScrollbars();
Refresh();
+
+ if ( flags & SetValue_SendEvent )
+ SendTextUpdatedEvent();
}
int wxTextCtrl::GetLineLength(long lineNo) const
}
int wxTextCtrl::GetLineLength(long lineNo) const
@@
-1898,7
+1901,7
@@
void wxTextCtrl::OnChar( wxKeyEvent &event )
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
event.SetEventObject(this);
event.SetString(GetValue());
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
event.SetEventObject(this);
event.SetString(GetValue());
- if (
GetEventHandler()->Process
Event(event)) return;
+ if (
HandleWindow
Event(event)) return;
}
if (IsSingleLine())
}
if (IsSingleLine())
@@
-2372,18
+2375,6
@@
wxSize wxTextCtrl::DoGetBestSize() const
}
}
}
}
-// ----------------------------------------------------------------------------
-// freeze/thaw
-// ----------------------------------------------------------------------------
-
-void wxTextCtrl::Freeze()
-{
-}
-
-void wxTextCtrl::Thaw()
-{
-}
-
void wxTextCtrl::OnSetFocus( wxFocusEvent& event )
{
// To hide or show caret, as appropriate
void wxTextCtrl::OnSetFocus( wxFocusEvent& event )
{
// To hide or show caret, as appropriate