added wxGetMultiChoice() (which refuses to work for some reason - will fix

[wxWidgets.git] / src / stc / stc.cpp

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 506493658e4447fe3ec83d3a43ad1fe61d41ed99..3573c3f648f30698b90e720960162bdb5e68e48c 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -98,7 +98,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
                                    long style,
                                    const wxString& name) :
     wxControl(parent, id, pos, size,
                                    long style,
                                    const wxString& name) :
     wxControl(parent, id, pos, size,

-              style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS,
+              style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,

               wxDefaultValidator, name)
 {
     m_swx = new ScintillaWX(this);
               wxDefaultValidator, name)
 {
     m_swx = new ScintillaWX(this);


@@ -119,6 +119,10 @@ long wxStyledTextCtrl::SendMsg(int msg, long wp, long lp) {
 }
 
 
 }
 
 

+#ifdef MAKELONG
+#undef MAKELONG
+#endif
+

 #define MAKELONG(a, b) ((a) | ((b) << 16))
 
 
 #define MAKELONG(a, b) ((a) | ((b) << 16))
 
 


@@ -1478,6 +1482,17 @@ wxPoint wxStyledTextCtrl::PointFromPosition(int pos) {
 }
 
 
 }
 
 

+// Scroll enough to make the given line visible
+void wxStyledTextCtrl::ScrollToLine(int line) {
+    m_swx->DoScrollToLine(line);
+}
+
+
+// Scroll enough to make the given column visible
+void wxStyledTextCtrl::ScrollToColumn(int column) {
+    m_swx->DoScrollToColumn(column);
+}
+

 
 //----------------------------------------------------------------------
 // Event handlers
 
 //----------------------------------------------------------------------
 // Event handlers