The sticky tag as a bit too sticky... This check-in should now update

the right branch!

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

diff --git a/wxPython/contrib/stc/build.cfg b/wxPython/contrib/stc/build.cfg
deleted file mode 100644 (file)
index 8d9408d..0000000
--- a/wxPython/contrib/stc/build.cfg
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- python -*-
-import sys
-
-MODULE = 'stc_c'
-SWIGFILES = ['stc_.i']
-SOURCES = []
-PYFILES = ['stc.py']
-
-
-OTHERSWIGFLAGS = '-I$(STCLOC)/contrib/include/wx/stc'
-SWIGDEPS = '$(STCLOC)/contrib/include/wx/stc/stc.h'
-
-SOURCES = SOURCES + [
-       '$(STCLOC)/contrib/src/stc/scintilla/src/AutoComplete.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/CallTip.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/CellBuffer.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/ContractionState.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/Document.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/Editor.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/Indicator.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/KeyMap.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/KeyWords.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/LineMarker.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/PropSet.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/ScintillaBase.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/Style.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/ViewStyle.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/LexCPP.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/LexHTML.cxx',
-        '$(STCLOC)/contrib/src/stc/scintilla/src/LexLua.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/LexOthers.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/LexPerl.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/LexPython.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/LexSQL.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/LexVB.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/DocumentAccessor.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/UniConversion.cxx',
-       '$(STCLOC)/contrib/src/stc/scintilla/src/WindowAccessor.cxx',
-        '$(STCLOC)/contrib/src/stc/scintilla/src/PosRegExp.cxx',
-
-       '$(STCLOC)/contrib/src/stc/PlatWX.cpp',
-       '$(STCLOC)/contrib/src/stc/ScintillaWX.cpp',
-       '$(STCLOC)/contrib/src/stc/stc.cpp',
-        ]
-
-OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \
-              '-I$(STCLOC)/contrib/src/stc/scintilla/include ' + \
-              '-I$(STCLOC)/contrib/include ' + \
-              '-I$(STCLOC)/contrib/src/stc/scintilla/src'
-
-
-if sys.platform == 'win32':
-    OTHERDEFS = 'STCLOC = $(WXWIN)'
-    OTHERRULES = '''
-{$(WXWIN)/contrib/src/stc}.cpp{}.obj:
-       $(cc) @<<
-$(CPPFLAGS) /c /Tp $<
-<<
-
-{$(WXWIN)/contrib/src/stc/scintilla/src}.cxx{}.obj:
-       $(cc) @<<
-$(CPPFLAGS) /c /Tp $<
-<<
-'''
-
-else:
-    DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles'
-    OTHERDEFS = 'STCLOC = .'
-    OTHERRULES = '''
-%.o : contrib/src/stc/%.cpp
-       $(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<
-
-%.o : contrib/src/stc/scintilla/src/%.cxx
-       $(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<
-
-contrib :
-       ln -s $(WXDIR)/contrib contrib
-
-'''
-
-
-# There are no platform differences so we don't need separate code directories
-GENCODEDIR='.'
-SWIGTOOLKITFLAG=''
-

diff --git a/wxPython/contrib/stc/stc.py b/wxPython/contrib/stc/stc.py
index dc5b89dbfaa7f17d9580407e81d9a4a8c75770b6..444839ca45d3a9363d9e53a4c4892fd3ee1e5d58 100644 (file)
--- a/wxPython/contrib/stc/stc.py
+++ b/wxPython/contrib/stc/stc.py
@@ -1,5 +1,5 @@
 
-# The name "stc.cpp" was cuasing the debugger to get confused with the
+# The name "stc.cpp" was causing the debugger to get confused with the
 # same module name in the stc library, so I changed the name of this
 # one to stc_.cpp and this little stub to make the "stc" Python module
 # name still usesable for everything that matters.

diff --git a/wxPython/contrib/stc/stc_.cpp b/wxPython/contrib/stc/stc_.cpp
index 41a7181ee9b8814c142aba6a8a3aad8508622c9f..c15e7b20294a5909ec3e04e48e9e3ac5548decb5 100644 (file)
--- a/wxPython/contrib/stc/stc_.cpp
+++ b/wxPython/contrib/stc/stc_.cpp
@@ -1,5 +1,5 @@
 /*
- * FILE : ./stc_.cpp
+ * FILE : contrib/stc/stc_.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -7009,6 +7009,62 @@ static PyObject *_wrap_wxStyledTextCtrl_PointFromPosition(PyObject *self, PyObje
     return _resultobj;
 }
 
+#define wxStyledTextCtrl_ScrollToLine(_swigobj,_swigarg0)  (_swigobj->ScrollToLine(_swigarg0))
+static PyObject *_wrap_wxStyledTextCtrl_ScrollToLine(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxStyledTextCtrl * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","line", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_ScrollToLine",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_ScrollToLine. Expected _wxStyledTextCtrl_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxStyledTextCtrl_ScrollToLine(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxStyledTextCtrl_ScrollToColumn(_swigobj,_swigarg0)  (_swigobj->ScrollToColumn(_swigarg0))
+static PyObject *_wrap_wxStyledTextCtrl_ScrollToColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxStyledTextCtrl * _arg0;
+    int  _arg1;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","column", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_ScrollToColumn",_kwnames,&_argo0,&_arg1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_ScrollToColumn. Expected _wxStyledTextCtrl_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxStyledTextCtrl_ScrollToColumn(_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 static void *SwigwxStyledTextEventTowxCommandEvent(void *ptr) {
     wxStyledTextEvent *src;
     wxCommandEvent *dest;
@@ -8006,6 +8062,8 @@ static PyMethodDef stc_cMethods[] = {
         { "wxStyledTextEvent_SetPosition", (PyCFunction) _wrap_wxStyledTextEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
         { "delete_wxStyledTextEvent", (PyCFunction) _wrap_delete_wxStyledTextEvent, METH_VARARGS | METH_KEYWORDS },
         { "new_wxStyledTextEvent", (PyCFunction) _wrap_new_wxStyledTextEvent, METH_VARARGS | METH_KEYWORDS },
+        { "wxStyledTextCtrl_ScrollToColumn", (PyCFunction) _wrap_wxStyledTextCtrl_ScrollToColumn, METH_VARARGS | METH_KEYWORDS },
+        { "wxStyledTextCtrl_ScrollToLine", (PyCFunction) _wrap_wxStyledTextCtrl_ScrollToLine, METH_VARARGS | METH_KEYWORDS },
         { "wxStyledTextCtrl_PointFromPosition", (PyCFunction) _wrap_wxStyledTextCtrl_PointFromPosition, METH_VARARGS | METH_KEYWORDS },
         { "wxStyledTextCtrl_GetSelection", (PyCFunction) _wrap_wxStyledTextCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
         { "wxStyledTextCtrl_SetMargins", (PyCFunction) _wrap_wxStyledTextCtrl_SetMargins, METH_VARARGS | METH_KEYWORDS },
@@ -8248,13 +8306,17 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxActivateEvent","_wxActivateEvent",0},
     { "_signed_long","_long",0},
     { "_wxMenuEvent","_class_wxMenuEvent",0},
+    { "_class_wxProcessEvent","_wxProcessEvent",0},
     { "_class_wxJPEGHandler","_wxJPEGHandler",0},
+    { "_class_wxFSFile","_wxFSFile",0},
     { "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0},
     { "_wxBitmapDataObject","_class_wxBitmapDataObject",0},
     { "_class_wxPyCommandEvent","_wxPyCommandEvent",0},
     { "_wxBMPHandler","_class_wxBMPHandler",0},
     { "_wxImage","_class_wxImage",0},
     { "_wxFlexGridSizer","_class_wxFlexGridSizer",0},
+    { "_wxWindowDisabler","_class_wxWindowDisabler",0},
+    { "_class_wxDateTime","_wxDateTime",0},
     { "_wxPrintQuality","_wxCoord",0},
     { "_wxPrintQuality","_int",0},
     { "_wxPrintQuality","_signed_int",0},
@@ -8278,9 +8340,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPaintEvent","_class_wxPaintEvent",0},
     { "_wxGIFHandler","_class_wxGIFHandler",0},
     { "_wxPySizer","_class_wxPySizer",0},
+    { "_wxInternetFSHandler","_class_wxInternetFSHandler",0},
     { "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
     { "_wxCursor","_class_wxCursor",0},
     { "_wxNotifyEvent","_class_wxNotifyEvent",0},
+    { "_wxPyProcess","_class_wxPyProcess",0},
     { "_wxPyTreeCtrl","_class_wxPyTreeCtrl",0},
     { "_wxImageHandler","_class_wxImageHandler",0},
     { "_wxLog","_class_wxLog",0},
@@ -8341,6 +8405,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxRealPoint","_wxRealPoint",0},
     { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
     { "_wxPNMHandler","_class_wxPNMHandler",0},
+    { "_wxPrinterDC","_class_wxPrinterDC",0},
     { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
     { "_wxLogGui","_class_wxLogGui",0},
     { "_class_wxMenuItem","_wxMenuItem",0},
@@ -8349,7 +8414,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxStatusBar","_wxStatusBar",0},
     { "_class_wxGIFHandler","_wxGIFHandler",0},
     { "_class_wxPySizer","_wxPySizer",0},
-    { "_class_wxPostScriptDC","_wxPostScriptDC",0},
     { "_wxPanel","_class_wxPanel",0},
     { "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
     { "_wxCheckBox","_class_wxCheckBox",0},
@@ -8361,6 +8425,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxKeyEvent","_wxKeyEvent",0},
     { "_class_wxToolTip","_wxToolTip",0},
     { "_class_wxPNGHandler","_wxPNGHandler",0},
+    { "_wxFileConfig","_class_wxFileConfig",0},
     { "_wxColour","_class_wxColour",0},
     { "_class_wxDialog","_wxDialog",0},
     { "_wxBusyCursor","_class_wxBusyCursor",0},
@@ -8404,6 +8469,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxLogWindow","_wxLogWindow",0},
     { "_class_wxImage","_wxImage",0},
     { "_wxPoint","_class_wxPoint",0},
+    { "_class_wxWindowDisabler","_wxWindowDisabler",0},
     { "_class_wxSashLayoutWindow","_wxSashLayoutWindow",0},
     { "_class_wxButton","_wxButton",0},
     { "_wxRadioBox","_class_wxRadioBox",0},
@@ -8411,8 +8477,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxFontData","_wxFontData",0},
     { "_class_wxPNMHandler","_wxPNMHandler",0},
     { "_wxBoxSizer","_class_wxBoxSizer",0},
+    { "_class_wxZipFSHandler","_wxZipFSHandler",0},
     { "_char","_wxChar",0},
     { "_wxBitmap","_class_wxBitmap",0},
+    { "_wxTaskBarIcon","_class_wxTaskBarIcon",0},
     { "_wxPrintDialog","_class_wxPrintDialog",0},
     { "_wxWindowDC","_class_wxWindowDC",0},
     { "_wxTimerEvent","_class_wxTimerEvent",0},
@@ -8421,14 +8489,17 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxSpinButton","_class_wxSpinButton",0},
     { "_wxColourDialog","_class_wxColourDialog",0},
     { "_wxPrintData","_class_wxPrintData",0},
+    { "_class_wxInternetFSHandler","_wxInternetFSHandler",0},
     { "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
     { "_class_wxNotifyEvent","_wxNotifyEvent",0},
     { "_wxMessageDialog","_class_wxMessageDialog",0},
     { "_class_wxValidator","_wxValidator",0},
     { "_class_wxPyEvent","_wxPyEvent",0},
     { "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
+    { "_wxConfig","_class_wxConfig",0},
     { "_class_wxIconizeEvent","_wxIconizeEvent",0},
     { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_class_wxFileConfig","_wxFileConfig",0},
     { "_class_wxBusyCursor","_wxBusyCursor",0},
     { "_wxToolBarSimple","_class_wxToolBarSimple",0},
     { "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
@@ -8439,6 +8510,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxScrollEvent","_class_wxScrollEvent",0},
     { "_wxToolBarToolBase","_class_wxToolBarToolBase",0},
     { "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0},
+    { "_class_wxMemoryFSHandler","_wxMemoryFSHandler",0},
     { "_EBool","_wxCoord",0},
     { "_EBool","_wxPrintQuality",0},
     { "_EBool","_signed_int",0},
@@ -8454,7 +8526,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPyDropTarget","_wxPyDropTarget",0},
     { "_wxCloseEvent","_class_wxCloseEvent",0},
     { "_class_wxSplitterEvent","_wxSplitterEvent",0},
+    { "_wxProcessEvent","_class_wxProcessEvent",0},
     { "_wxNotebook","_class_wxNotebook",0},
+    { "_wxFSFile","_class_wxFSFile",0},
     { "_unsigned_long","_long",0},
     { "_class_wxRect","_wxRect",0},
     { "_class_wxDC","_wxDC",0},
@@ -8462,12 +8536,15 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxGenericDragImage","_class_wxGenericDragImage",0},
     { "_class_wxProgressDialog","_wxProgressDialog",0},
     { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0},
+    { "_wxPyInputStream","_class_wxPyInputStream",0},
     { "_wxPyApp","_class_wxPyApp",0},
     { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0},
+    { "_class_wxOutputStream","_wxOutputStream",0},
     { "_wxLogTextCtrl","_class_wxLogTextCtrl",0},
     { "_wxMDIParentFrame","_class_wxMDIParentFrame",0},
     { "_class_wxTreeEvent","_wxTreeEvent",0},
     { "_class_wxDirDialog","_wxDirDialog",0},
+    { "_wxTimeSpan","_class_wxTimeSpan",0},
     { "_wxFocusEvent","_class_wxFocusEvent",0},
     { "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
     { "_class_wxTimerEvent","_wxTimerEvent",0},
@@ -8487,6 +8564,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxTextCtrl","_wxTextCtrl",0},
     { "_class_wxListItemAttr","_wxListItemAttr",0},
     { "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
+    { "_wxMetaFileDC","_class_wxMetaFileDC",0},
     { "_class_wxTextDataObject","_wxTextDataObject",0},
     { "_wxMenu","_class_wxMenu",0},
     { "_class_wxMoveEvent","_wxMoveEvent",0},
@@ -8494,6 +8572,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxScreenDC","_class_wxScreenDC",0},
     { "_class_wxToolBarSimple","_wxToolBarSimple",0},
     { "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
+    { "_WXTYPE","_wxDateTime_t",0},
     { "_WXTYPE","_short",0},
     { "_WXTYPE","_signed_short",0},
     { "_WXTYPE","_unsigned_short",0},
@@ -8503,6 +8582,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
     { "_class_wxBrush","_wxBrush",0},
     { "_wxTipProvider","_class_wxTipProvider",0},
+    { "_unsigned_short","_wxDateTime_t",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_unsigned_short","_short",0},
     { "_class_wxWindow","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxWindow},
@@ -8510,6 +8590,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxWindow","_wxWindow",0},
     { "_class_wxLogStderr","_wxLogStderr",0},
     { "_wxSplitterWindow","_class_wxSplitterWindow",0},
+    { "_wxDateSpan","_class_wxDateSpan",0},
     { "_class_wxStyledTextEvent","_wxStyledTextEvent",0},
     { "_class_wxStaticText","_wxStaticText",0},
     { "_wxPrintDialogData","_class_wxPrintDialogData",0},
@@ -8528,6 +8609,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxListCtrl","_class_wxListCtrl",0},
     { "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0},
     { "_class_wxPoint","_wxPoint",0},
+    { "_class_wxPyInputStream","_wxPyInputStream",0},
     { "_wxRealPoint","_class_wxRealPoint",0},
     { "_class_wxRadioBox","_wxRadioBox",0},
     { "_class_wxBoxSizer","_wxBoxSizer",0},
@@ -8535,7 +8617,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_signed_short","_short",0},
     { "_wxMemoryDC","_class_wxMemoryDC",0},
     { "_wxPyTextDataObject","_class_wxPyTextDataObject",0},
+    { "_class_wxTaskBarIcon","_wxTaskBarIcon",0},
     { "_class_wxPrintDialog","_wxPrintDialog",0},
+    { "_wxPyFileSystemHandler","_class_wxPyFileSystemHandler",0},
     { "_wxPaintDC","_class_wxPaintDC",0},
     { "_class_wxWindowDC","_wxWindowDC",0},
     { "_class_wxFocusEvent","_wxFocusEvent",0},
@@ -8543,13 +8627,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxStatusBar","_class_wxStatusBar",0},
     { "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
     { "_class_wxCursor","_wxCursor",0},
-    { "_wxPostScriptDC","_class_wxPostScriptDC",0},
     { "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
+    { "_class_wxPyProcess","_wxPyProcess",0},
     { "_class_wxImageHandler","_wxImageHandler",0},
     { "_wxScrolledWindow","_class_wxScrolledWindow",0},
     { "_class_wxLog","_wxLog",0},
     { "_wxTreeItemId","_class_wxTreeItemId",0},
     { "_unsigned_char","_byte",0},
+    { "_class_wxMetaFileDC","_wxMetaFileDC",0},
     { "_class_wxMenu","_wxMenu",0},
     { "_wxControl","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl},
     { "_wxControl","_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxControl},
@@ -8568,6 +8653,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPen","_wxPen",0},
     { "_class_wxFileDialog","_wxFileDialog",0},
     { "_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0},
+    { "_wxConfigBase","_class_wxConfigBase",0},
+    { "_short","_wxDateTime_t",0},
     { "_short","_WXTYPE",0},
     { "_short","_unsigned_short",0},
     { "_short","_signed_short",0},
@@ -8582,6 +8669,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0},
     { "_class_wxImageList","_wxImageList",0},
     { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxFileSystemHandler","_class_wxFileSystemHandler",0},
     { "_wxPyTipProvider","_class_wxPyTipProvider",0},
     { "_wxFrame","_class_wxFrame",0},
     { "_wxPCXHandler","_class_wxPCXHandler",0},
@@ -8614,8 +8702,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxLogWindow","_class_wxLogWindow",0},
     { "_class_wxListEvent","_wxListEvent",0},
     { "_class_wxPrintPreview","_wxPrintPreview",0},
+    { "_wxDateTime_t","_unsigned_short",0},
+    { "_wxDateTime_t","_short",0},
+    { "_wxDateTime_t","_WXTYPE",0},
     { "_class_wxSpinEvent","_wxSpinEvent",0},
     { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0},
+    { "_wxDateTime","_class_wxDateTime",0},
     { "_time_t","_wxCoord",0},
     { "_time_t","_wxPrintQuality",0},
     { "_time_t","_unsigned_int",0},
@@ -8626,15 +8718,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0},
     { "_wxLogNull","_class_wxLogNull",0},
     { "_wxButton","_class_wxButton",0},
+    { "_wxZipFSHandler","_class_wxZipFSHandler",0},
     { "_class_wxPyApp","_wxPyApp",0},
     { "_wxSize","_class_wxSize",0},
     { "_wxRegionIterator","_class_wxRegionIterator",0},
+    { "_class_wxPrinterDC","_wxPrinterDC",0},
     { "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
     { "_class_wxLogTextCtrl","_wxLogTextCtrl",0},
     { "_class_wxLogGui","_wxLogGui",0},
     { "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
     { "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
     { "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},
+    { "_class_wxTimeSpan","_wxTimeSpan",0},
+    { "_class_wxPyFileSystemHandler","_wxPyFileSystemHandler",0},
     { "_class_wxPaintDC","_wxPaintDC",0},
     { "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
     { "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0},
@@ -8657,6 +8753,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPageSetupDialog","_wxPageSetupDialog",0},
     { "_wxPalette","_class_wxPalette",0},
     { "_class_wxIdleEvent","_wxIdleEvent",0},
+    { "_class_wxConfigBase","_wxConfigBase",0},
     { "_wxCoord","_int",0},
     { "_wxCoord","_signed_int",0},
     { "_wxCoord","_unsigned_int",0},
@@ -8672,10 +8769,13 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxTipProvider","_wxTipProvider",0},
     { "_class_wxMiniFrame","_wxMiniFrame",0},
     { "_wxFontDialog","_class_wxFontDialog",0},
+    { "_wxMemoryFSHandler","_class_wxMemoryFSHandler",0},
     { "_wxRegion","_class_wxRegion",0},
     { "_class_wxSplitterWindow","_wxSplitterWindow",0},
     { "_wxPreviewFrame","_class_wxPreviewFrame",0},
     { "_wxSizer","_class_wxSizer",0},
+    { "_class_wxDateSpan","_wxDateSpan",0},
+    { "_wxFileSystem","_class_wxFileSystem",0},
     { "_class_wxShowEvent","_wxShowEvent",0},
     { "_class_wxPyTipProvider","_wxPyTipProvider",0},
     { "_class_wxPCXHandler","_wxPCXHandler",0},
@@ -8698,6 +8798,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxMemoryDC","_wxMemoryDC",0},
     { "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0},
     { "_wxMenuBar","_class_wxMenuBar",0},
+    { "_wxOutputStream","_class_wxOutputStream",0},
     { "_wxTreeEvent","_class_wxTreeEvent",0},
     { "_wxDirDialog","_class_wxDirDialog",0},
     { "_wxEvtHandler","_class_wxStyledTextCtrl",SwigwxStyledTextCtrlTowxEvtHandler},
@@ -8710,6 +8811,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxScrolledWindow","_wxScrolledWindow",0},
     { "_wxListItemAttr","_class_wxListItemAttr",0},
     { "_class_wxTextEntryDialog","_wxTextEntryDialog",0},
+    { "_class_wxConfig","_wxConfig",0},
     { "_wxKeyEvent","_class_wxKeyEvent",0},
     { "_wxMoveEvent","_class_wxMoveEvent",0},
     { "_wxColourData","_class_wxColourData",0},
@@ -8729,6 +8831,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxWindow","_class_wxWindow",0},
     { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0},
     { "_wxLogStderr","_class_wxLogStderr",0},
+    { "_class_wxFileSystemHandler","_wxFileSystemHandler",0},
+    { "_class_wxFileSystem","_wxFileSystem",0},
     { "_wxStyledTextEvent","_class_wxStyledTextEvent",0},
     { "_class_wxFrame","_wxFrame",0},
 {0,0,0}};

diff --git a/wxPython/contrib/stc/stc_.py b/wxPython/contrib/stc/stc_.py
index 28adf75bde96f5c99c528c13afab565e50bf38ae..b77cd7e8d0433361beef04d45e3891dee0392632 100644 (file)
--- a/wxPython/contrib/stc/stc_.py
+++ b/wxPython/contrib/stc/stc_.py
@@ -13,6 +13,8 @@ from clip_dnd import *
 
 from events import *
 
+from streams import *
+
 from mdi import *
 
 from frames import *
@@ -35,6 +37,10 @@ from printfw import *
 
 from sizers import *
 
+from filesys import *
+
+from utils import *
+
 def EVT_STC_CHANGE(win, id, fn):
     win.Connect(id, -1, wxEVT_STC_CHANGE, fn)
 
@@ -762,6 +768,12 @@ class wxStyledTextCtrlPtr(wxControlPtr):
         val = apply(stc_c.wxStyledTextCtrl_PointFromPosition,(self,) + _args, _kwargs)
         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
+    def ScrollToLine(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ScrollToLine,(self,) + _args, _kwargs)
+        return val
+    def ScrollToColumn(self, *_args, **_kwargs):
+        val = apply(stc_c.wxStyledTextCtrl_ScrollToColumn,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxStyledTextCtrl instance at %s>" % (self.this,)
 class wxStyledTextCtrl(wxStyledTextCtrlPtr):

diff --git a/wxPython/contrib/stc/stub.cpp b/wxPython/contrib/stc/stub.cpp
new file mode 100644 (file)
index 0000000..4f696dc
--- /dev/null
+++ b/wxPython/contrib/stc/stub.cpp
@@ -0,0 +1,23 @@
+/* Definitions for Windows/Unix exporting */
+#if defined(__WIN32__)
+#   if defined(_MSC_VER)
+#      define SWIGEXPORT(a) __declspec(dllexport) a
+#   else
+#      if defined(__BORLANDC__)
+#          define SWIGEXPORT(a) a _export
+#      else
+#          define SWIGEXPORT(a) a
+#      endif
+#   endif
+#else
+#   define SWIGEXPORT(a) a
+#endif
+
+
+#ifdef __cplusplus
+extern "C"
+#endif
+SWIGEXPORT(void) initstc_c() {
+}
+
+