Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always use wxHSCROLL|wxVSCROLL.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-04-02 21:15:27 +00:00
parent bc31c60fff
commit a0421c774c
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/src/stc/stc.cpp
View File

@@ -158,9 +158,7 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
long style, long style,
const wxString& name) const wxString& name)
{ {
#ifdef __WXMAC__
style |= wxVSCROLL | wxHSCROLL; style |= wxVSCROLL | wxHSCROLL;
#endif
if (!wxControl::Create(parent, id, pos, size, if (!wxControl::Create(parent, id, pos, size,
style | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name)) wxDefaultValidator, name))
@@ -3118,6 +3116,13 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
#endif #endif
bool skip = ((ctrl || alt) && ! (ctrl && alt)); bool skip = ((ctrl || alt) && ! (ctrl && alt));
#if wxUSE_UNICODE
// apparently if we don't do this, Unicode keys pressed after non-char
// ASCII ones (e.g. Enter, Tab) are not taken into account (patch 1615989)
if (m_lastKeyDownConsumed && evt.GetUnicodeKey() > 255)
m_lastKeyDownConsumed = false;
#endif
if (!m_lastKeyDownConsumed && !skip) { if (!m_lastKeyDownConsumed && !skip) {
#if wxUSE_UNICODE #if wxUSE_UNICODE
int key = evt.GetUnicodeKey(); int key = evt.GetUnicodeKey();

2
contrib/src/stc/stc.cpp.in
View File

@@ -158,9 +158,7 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
long style, long style,
const wxString& name) const wxString& name)
{ {
#ifdef __WXMAC__
style |= wxVSCROLL | wxHSCROLL; style |= wxVSCROLL | wxHSCROLL;
#endif
if (!wxControl::Create(parent, id, pos, size, if (!wxControl::Create(parent, id, pos, size,
style | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name)) wxDefaultValidator, name))

9
src/stc/stc.cpp
View File

@@ -158,9 +158,7 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
long style, long style,
const wxString& name) const wxString& name)
{ {
#ifdef __WXMAC__
style |= wxVSCROLL | wxHSCROLL; style |= wxVSCROLL | wxHSCROLL;
#endif
if (!wxControl::Create(parent, id, pos, size, if (!wxControl::Create(parent, id, pos, size,
style | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name)) wxDefaultValidator, name))
@@ -3118,6 +3116,13 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
#endif #endif
bool skip = ((ctrl || alt) && ! (ctrl && alt)); bool skip = ((ctrl || alt) && ! (ctrl && alt));
#if wxUSE_UNICODE
// apparently if we don't do this, Unicode keys pressed after non-char
// ASCII ones (e.g. Enter, Tab) are not taken into account (patch 1615989)
if (m_lastKeyDownConsumed && evt.GetUnicodeKey() > 255)
m_lastKeyDownConsumed = false;
#endif
if (!m_lastKeyDownConsumed && !skip) { if (!m_lastKeyDownConsumed && !skip) {
#if wxUSE_UNICODE #if wxUSE_UNICODE
int key = evt.GetUnicodeKey(); int key = evt.GetUnicodeKey();

2
src/stc/stc.cpp.in
View File

@@ -158,9 +158,7 @@ bool wxStyledTextCtrl::Create(wxWindow *parent,
long style, long style,
const wxString& name) const wxString& name)
{ {
#ifdef __WXMAC__
style |= wxVSCROLL | wxHSCROLL; style |= wxVSCROLL | wxHSCROLL;
#endif
if (!wxControl::Create(parent, id, pos, size, if (!wxControl::Create(parent, id, pos, size,
style | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name)) wxDefaultValidator, name))