wxMac needs the scroll styles

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

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index a9ca85c5c16ff28696266f08ae5a3c161ca54d26..8d03e9c92d6cd86ceedd77e1164049bfaf7349a6 100644 (file)
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -150,6 +150,9 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
                                    long style,
                                    const wxString& name)
 {
                                    long style,
                                    const wxString& name)
 {

+#ifdef __WXMAC__
+    style |= wxVSCROLL | wxHSCROLL;
+#endif

     wxControl::Create(parent, id, pos, size,
                       style | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name);
     wxControl::Create(parent, id, pos, size,
                       style | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name);

diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in
index d94ba9ac68f65d9f9564bc84b0894aaf41d52eee..b10b081bb71fd13d462931ce16e2a2a7a38772ac 100644 (file)
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -150,6 +150,9 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
                                    long style,
                                    const wxString& name)
 {
                                    long style,
                                    const wxString& name)
 {

+#ifdef __WXMAC__
+    style |= wxVSCROLL | wxHSCROLL;
+#endif

     wxControl::Create(parent, id, pos, size,
               style | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name);
     wxControl::Create(parent, id, pos, size,
               style | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name);

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index a9ca85c5c16ff28696266f08ae5a3c161ca54d26..8d03e9c92d6cd86ceedd77e1164049bfaf7349a6 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -150,6 +150,9 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
                                    long style,
                                    const wxString& name)
 {
                                    long style,
                                    const wxString& name)
 {

+#ifdef __WXMAC__
+    style |= wxVSCROLL | wxHSCROLL;
+#endif

     wxControl::Create(parent, id, pos, size,
                       style | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name);
     wxControl::Create(parent, id, pos, size,
                       style | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name);

diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
index d94ba9ac68f65d9f9564bc84b0894aaf41d52eee..b10b081bb71fd13d462931ce16e2a2a7a38772ac 100644 (file)
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -150,6 +150,9 @@ void wxStyledTextCtrl::Create(wxWindow *parent,
                                    long style,
                                    const wxString& name)
 {
                                    long style,
                                    const wxString& name)
 {

+#ifdef __WXMAC__
+    style |= wxVSCROLL | wxHSCROLL;
+#endif

     wxControl::Create(parent, id, pos, size,
               style | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name);
     wxControl::Create(parent, id, pos, size,
               style | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name);