projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update docs to mention new filesystem handlers.
[wxWidgets.git]
/
src
/
os2
/
textctrl.cpp
diff --git
a/src/os2/textctrl.cpp
b/src/os2/textctrl.cpp
index f5ac61433c7d0224fb1aea051d0b0f36bbcf0426..111a63165bd0edd45d4dcec0ddd621b70d2cecd4 100644
(file)
--- a/
src/os2/textctrl.cpp
+++ b/
src/os2/textctrl.cpp
@@
-125,6
+125,7
@@
bool wxTextCtrl::Create(
m_windowStyle = lStyle;
m_bIsMLE = false;
m_windowStyle = lStyle;
m_bIsMLE = false;
+ m_bSkipUpdate = false;
long lSstyle = WS_VISIBLE | WS_TABSTOP;
long lSstyle = WS_VISIBLE | WS_TABSTOP;
@@
-343,8
+344,9
@@
wxString wxTextCtrl::GetValue() const
return sStr;
} // end of wxTextCtrl::GetValue
return sStr;
} // end of wxTextCtrl::GetValue
-void wxTextCtrl::SetValue(
- const wxString& rsValue
+void wxTextCtrl::DoSetValue(
+ const wxString& rsValue,
+ int flags
)
{
//
)
{
//
@@
-355,6
+357,9
@@
void wxTextCtrl::SetValue(
//
if ((rsValue.length() > 0x400) || (rsValue != GetValue()))
{
//
if ((rsValue.length() > 0x400) || (rsValue != GetValue()))
{
+ if ( flags & SetValue_SendEvent )
+ m_bSkipUpdate = true;
+
::WinSetWindowText(GetHwnd(), (PSZ)rsValue.c_str());
AdjustSpaceLimit();
}
::WinSetWindowText(GetHwnd(), (PSZ)rsValue.c_str());
AdjustSpaceLimit();
}
@@
-1095,6
+1100,12
@@
bool wxTextCtrl::OS2Command(
case EN_CHANGE:
{
case EN_CHANGE:
{
+ if (m_bSkipUpdate)
+ {
+ m_bSkipUpdate = false;
+ break;
+ }
+
wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED
,m_windowId
);
wxCommandEvent vEvent( wxEVT_COMMAND_TEXT_UPDATED
,m_windowId
);