merged 2.2 branch

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

wxPython/contrib/stc/.cvsignore

@@ -0,0 +1,5 @@
+Makefile
+Makefile
+stc_c.exp
+stc_c.ilk
+stc_c.pch

wxPython/contrib/stc/README.txt

@@ -0,0 +1,7 @@
+Since STC is not always bundled with distributions of wxWindows, in
+order for it to be a standard part of wxPython I need to bundle it
+here.  The contents of the contrib directory are copies of the
+relevant parts of the main contrib directory in wxWindows.  The
+build.py script in this directory will also build the needed files
+from there, so you no longer have to worry about aquiring and building
+additional libraries beyond wxWindows itself.

wxPython/contrib/stc/_stcextras.py

@@ -0,0 +1,3 @@
+# Stuff these names into the wx namespace so wxPyConstructObject can find them
+
+wx.wxStyledTextEventPtr       = wxStyledTextEventPtr

wxPython/contrib/stc/build.cfg

@@ -0,0 +1,83 @@
+# -*- 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/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/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 $(WXWIN)/contrib contrib
+
+'''
+
+
+# There are no platform differences so we don't need separate code directories
+GENCODEDIR='.'
+SWIGTOOLKITFLAG=''
+

wxPython/contrib/stc/stc.py

@@ -0,0 +1,7 @@
+
+# The name "stc.cpp" was cuasing 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.
+
+from stc_ import *

wxPython/contrib/stc/stc_.i

@@ -0,0 +1,102 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        stc.i
+// Purpose:     Wrappers for the wxStyledTextCtrl.
+//
+// Author:      Robin Dunn
+//
+// Created:     12-Oct-1999
+// RCS-ID:      $Id$
+// Copyright:   (c) 2000 by Total Control Software
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+%module stc_
+
+
+%{
+#include "helpers.h"
+#include "wx/stc/stc.h"
+%}
+
+//---------------------------------------------------------------------------
+
+%include typemaps.i
+%include my_typemaps.i
+
+%extern wx.i
+%extern windows.i
+%extern _defs.i
+%extern events.i
+%extern controls.i
+
+
+//----------------------------------------------------------------------
+// Get all our defs from the REAL header file.
+
+%include stc.h
+%include SciLexer.h
+
+//----------------------------------------------------------------------
+// Python functions to act like the event macros
+
+%pragma(python) code = "
+def EVT_STC_CHANGE(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_CHANGE, fn)
+
+def EVT_STC_STYLENEEDED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_STYLENEEDED, fn)
+
+def EVT_STC_CHARADDED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_CHARADDED, fn)
+
+def EVT_STC_UPDATEUI(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_UPDATEUI, fn)
+
+def EVT_STC_SAVEPOINTREACHED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_SAVEPOINTREACHED, fn)
+
+def EVT_STC_SAVEPOINTLEFT(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_SAVEPOINTLEFT, fn)
+
+def EVT_STC_ROMODIFYATTEMPT(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_ROMODIFYATTEMPT, fn)
+
+def EVT_STC_DOUBLECLICK(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_DOUBLECLICK, fn)
+
+def EVT_STC_MODIFIED(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_MODIFIED, fn)
+
+def EVT_STC_KEY(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_KEY, fn)
+
+def EVT_STC_MACRORECORD(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_MACRORECORD, fn)
+
+def EVT_STC_MARGINCLICK(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_MARGINCLICK, fn)
+
+def EVT_STC_NEEDSHOWN(win, id, fn):
+    win.Connect(id, -1, wxEVT_STC_NEEDSHOWN, fn)
+
+
+"
+
+//----------------------------------------------------------------------
+
+%init %{
+
+    wxClassInfo::CleanUpClasses();
+    wxClassInfo::InitializeClasses();
+
+%}
+
+
+//----------------------------------------------------------------------
+
+%pragma(python) include="_stcextras.py";
+
+//----------------------------------------------------------------------
+//----------------------------------------------------------------------
+
+