This commit was manufactured by cvs2svn to create tag 'wxPy_2_4_0_6'.

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

Makefile.in

@@ -1257,12 +1257,6 @@ SAMPLES_DIST: ALL_GUI_DIST
 	cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub
 	cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub
 
-	mkdir $(DISTDIR)/samples/shaped
-	cp $(SAMPDIR)/shaped/Makefile.in $(DISTDIR)/samples/shaped
-	cp $(SAMPDIR)/shaped/makefile.unx $(DISTDIR)/samples/shaped
-	cp $(SAMPDIR)/shaped/*.cpp $(DISTDIR)/samples/shaped
-	cp $(SAMPDIR)/shaped/*.png $(DISTDIR)/samples/shaped
-
 	mkdir $(DISTDIR)/samples/sockets
 	cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets
 	cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets
@@ -1430,73 +1424,70 @@ MANUAL_DIST:
 
 # this target does not generate a complete wxPython dist, it only includes
 # those files needed for the Debian source package.
-# see wxPython/distrib for scripts to make a proper wxPython dist.
+# see utils/wxPython/distrib for scripts to make a proper wxPython dist.
-#
-# first copy everything and then clean up the CVS stuff and etc...
 PYTHON_DIST:
-	for dir in \
+	mkdir $(DISTDIR)/wxPython
-		wxPython \
+	mkdir $(DISTDIR)/wxPython/contrib
-		wxPython/contrib \
+	mkdir $(DISTDIR)/wxPython/contrib/dllwidget
-		wxPython/contrib/dllwidget \
+	mkdir $(DISTDIR)/wxPython/contrib/gizmos
-		wxPython/contrib/gizmos \
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas
-		wxPython/contrib/glcanvas \
+	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
-		wxPython/contrib/glcanvas/gtk \
+	mkdir $(DISTDIR)/wxPython/contrib/ogl
-		wxPython/contrib/ogl \
+	mkdir $(DISTDIR)/wxPython/contrib/stc
-		wxPython/contrib/stc \
+	mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
-		wxPython/contrib/stc/gtk \
+	mkdir $(DISTDIR)/wxPython/contrib/xrc
-		wxPython/contrib/xrc \
+	mkdir $(DISTDIR)/wxPython/demo
-		wxPython/demo \
+	mkdir $(DISTDIR)/wxPython/demo/bitmaps
-		wxPython/demo/bitmaps \
+	mkdir $(DISTDIR)/wxPython/demo/bmp_source
-		wxPython/demo/bmp_source \
+	mkdir $(DISTDIR)/wxPython/demo/data
-		wxPython/demo/data \
+	mkdir $(DISTDIR)/wxPython/demo/dllwidget
-		wxPython/demo/dllwidget \
+	mkdir $(DISTDIR)/wxPython/distutils
-		wxPython/samples/StyleEditor \
+	mkdir $(DISTDIR)/wxPython/distutils/command
-		wxPython/samples/doodle \
+	mkdir $(DISTDIR)/wxPython/src
-		wxPython/samples/embedded \
+	mkdir $(DISTDIR)/wxPython/src/gtk
-		wxPython/samples/frogedit \
+	mkdir $(DISTDIR)/wxPython/scripts
-		wxPython/samples/pySketch \
+	mkdir $(DISTDIR)/wxPython/wxPython
-		wxPython/samples/pySketch/images \
+	mkdir $(DISTDIR)/wxPython/wxPython/lib
-		wxPython/samples/wxProject \
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
-		wxPython/samples/wx_examples \
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust/wxd
-		wxPython/samples/wx_examples/basic \
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/colourchooser
-		wxPython/samples/wx_examples/hello \
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
-		wxPython/samples/wx_examples/screenshots \
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
-		wxPython/distutils \
+	mkdir $(DISTDIR)/wxPython/wxPython/tools
-		wxPython/distutils/command \
+	mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
-		wxPython/scripts \
+
-		wxPython/src \
+	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
-		wxPython/src/gtk \
+	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
-		wxPython/wx \
+	cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
-		wxPython/wx/lib \
+	cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
-		wxPython/wx/lib/colourchooser \
+	cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
-		wxPython/wx/lib/editor \
+	cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
-		wxPython/wx/lib/mixins \
+	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
-		wxPython/wx/py \
+	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
-		wxPython/wxPython \
+	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
-		wxPython/wxPython/lib \
+	-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
-		wxPython/wxPython/lib/PyCrust \
+	-cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
-		wxPython/wxPython/lib/colourchooser \
+	-cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
-		wxPython/wxPython/lib/editor \
+	-cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo
-		wxPython/wxPython/lib/mixins \
+	-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
-		wxPython/wxPython/tools \
+	-cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source
-		wxPython/wxPython/tools/XRCed \
+	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
-		wxPython/wxPython/tools/XRCed/src-images \
+	-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
-		wxPython/wxPython/py \
+	-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
-		wxPython/wxPython/py/tests \
+	cp $(WXDIR)/wxPython/distutils/*.py $(DISTDIR)/wxPython/distutils
-		wxPython/wxPython/py/wxd \
+	cp $(WXDIR)/wxPython/distutils/command/*.py $(DISTDIR)/wxPython/distutils/command
-		; do \
+	-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
-			echo "Copying dir: $$dir..."; \
+	-cp $(WXDIR)/wxPython/src/* $(DISTDIR)/wxPython/src
-			mkdir $(DISTDIR)/$$dir; \
+	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
-			cp $(WXDIR)/$$dir/* $(DISTDIR)/$$dir > /dev/null 2>&1; \
+	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
-		done; \
+	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
-		\
+	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
-		find $(DISTDIR)/wxPython -name "*~"           > RM_FILES; \
+	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/wxd/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust/wxd
-		find $(DISTDIR)/wxPython -name "*.pyc"       >> RM_FILES; \
+	cp $(WXDIR)/wxPython/wxPython/lib/colourchooser/*.py $(DISTDIR)/wxPython/wxPython/lib/colourchooser
-		find $(DISTDIR)/wxPython -name "*.bat"       >> RM_FILES; \
+	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
-		find $(DISTDIR)/wxPython -name "core"        >> RM_FILES; \
+	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
-		find $(DISTDIR)/wxPython -name "core.[0-9]*" >> RM_FILES; \
+	cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
-		for f in `cat RM_FILES`; do rm $$f; done; \
+	cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed
-		rm RM_FILES
 
 distclean:
 	$(RM) -r _dist_dir

configure.in

@@ -48,7 +48,7 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=4
-WX_RELEASE_NUMBER=1
+WX_RELEASE_NUMBER=0
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
@@ -228,7 +228,7 @@ case "${host}" in
     dnl
     dnl     Both archive libraries and shared libraries on AIX have an .a
     dnl     extension. This will explain why you can't link with an .so and
-    dnl     why it works with the name changed to .a.
+    dnl     why it works with the name changed to .a. 
     SO_SUFFIX=a
     AC_DEFINE(__AIX__)
     AC_DEFINE(__SYSV__)
@@ -1679,7 +1679,7 @@ if test "$wxUSE_REGEX" != "no"; then
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
         dnl according to Unix 98 specs, regcomp() is in libc but I believe that
         dnl on some old systems it may be in libregex - check for it too?
-        AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp)])
+        AC_CHECK_HEADER(regex.h, AC_CHECK_FUNCS(regcomp))
 
         if test "x$ac_cv_func_regcomp" != "xyes"; then
             if test "$wxUSE_REGEX" = "sys" ; then
@@ -1724,12 +1724,14 @@ if test "$wxUSE_ZLIB" != "no" ; then
             dnl has anything more ancient (1.1.3 was released in July 1998)
             dnl anyhow
             AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h,
-                [AC_TRY_RUN(
+                AC_TRY_RUN(
-                    dnl zlib.h defines ZLIB_VERSION="x.y.z"
                     [
+                        dnl zlib.h defines ZLIB_VERSION="x.y.z"
                         #include <zlib.h>
                         #include <stdio.h>
 
+                        dnl don't use the brackets as quotes, we need them
+                        changequote(,)
                         int main()
                         {
                             FILE *f=fopen("conftestval", "w");
@@ -1741,12 +1743,13 @@ if test "$wxUSE_ZLIB" != "no" ; then
                                      ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
                             exit(0);
                         }
+                        changequote([,])
                     ],
                     ac_cv_header_zlib_h=`cat conftestval`,
                     ac_cv_header_zlib_h=no,
                     dnl cross-compiling: test if we have any zlib.h
-                    [AC_CHECK_HEADER(zlib.h)]
+                    AC_CHECK_HEADER(zlib.h)
-                )]
+                )
             )
 
             system_zlib_h_ok=$ac_cv_header_zlib_h
@@ -1802,9 +1805,9 @@ if test "$wxUSE_LIBPNG" != "no" ; then
             dnl libpng version 0.9 is known to not work, if an even newer
             dnl version is required, just bump it up in the test below
             AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
-                [AC_TRY_RUN(
+                AC_TRY_RUN(
-                    dnl png.h defines PNG_LIBPNG_VER=number
                     [
+                        dnl png.h defines PNG_LIBPNG_VER=number
                         #include <png.h>
                         #include <stdio.h>
 
@@ -1820,8 +1823,8 @@ if test "$wxUSE_LIBPNG" != "no" ; then
                     ac_cv_header_png_h=`cat conftestval`,
                     ac_cv_header_png_h=no,
                     dnl cross-compiling: test if we have any png.h
-                    [AC_CHECK_HEADER(png.h)]
+                    AC_CHECK_HEADER(png.h)
-                )]
+                )
             )
 
             if test "$ac_cv_header_png_h" = "yes"; then
@@ -2208,7 +2211,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
         fi
         AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os")
-
+ 
         wxUSE_UNIVERSAL="yes"
 
         TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
@@ -2794,7 +2797,7 @@ case "${host}" in
     *-*-darwin* )
         dnl Under Mac OS X, the naming conventions for shared libraries
         dnl are different: the number precedes the suffix.
-
+        
         WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
         WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
 
@@ -3079,12 +3082,11 @@ dnl   defines uid_t and gid_t if not already defined
 AC_TYPE_UID_T
 
 dnl check what exactly size_t is on this machine - this is necessary to avoid
-dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
+dnl ambiguos overloads in several places, notably wx/string.h and wx/array.h
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 AC_CACHE_CHECK([if size_t is unsigned int],
     wx_cv_size_t_is_uint,
-    [
     dnl an obvious check like AC_TRY_COMPILE[struct Foo { ... };] doesn't work
     dnl with egcs (at least) up to 1.1.1 as it allows you to compile duplicate
     dnl methods in a local class (i.e. class inside a function) declaration
@@ -3102,7 +3104,6 @@ AC_CACHE_CHECK([if size_t is unsigned int],
         wx_cv_size_t_is_uint=no,
         wx_cv_size_t_is_uint=yes
     )
-    ]
 )
 
 if test "$wx_cv_size_t_is_uint" = "yes"; then
@@ -3677,17 +3678,17 @@ if test "$TOOLKIT" != "MSW"; then
       dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
       HAVE_PRIOR_FUNCS=0
       AC_CHECK_FUNC(pthread_attr_getschedpolicy,
-                     [AC_CHECK_FUNC(pthread_attr_setschedparam,
+                     AC_CHECK_FUNC(pthread_attr_setschedparam,
-                       [AC_CHECK_FUNC(sched_get_priority_max,
+                       AC_CHECK_FUNC(sched_get_priority_max,
                            HAVE_PRIOR_FUNCS=1,
-                           [AC_CHECK_LIB([posix4], sched_get_priority_max,
+                           AC_CHECK_LIB([posix4], sched_get_priority_max,
                              [
                                 HAVE_PRIOR_FUNCS=1
                                 POSIX4_LINK=" -lposix4"
                              ],
-                           )]
+                           )
-                       )]
+                       )
-                     )]
+                     )
                    )
 
       if test "$HAVE_PRIOR_FUNCS" = 1; then
@@ -5300,7 +5301,7 @@ if test "$wxUSE_GUI" = "yes"; then
     dnl      ipc, mfc, nativdlg, oleauto, ownerdrw
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                      drawing dynamic erase event exec font image \
-                     minimal propsize rotate shaped widgets"
+                     minimal propsize rotate widgets"
 
     dnl this is needed to be able to find AFM files
     CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"

contrib/include/wx/animate/animate.h

@@ -138,7 +138,7 @@ public:
 //// Implementation
 
     // Play the frame
-    virtual bool PlayFrame(int frame, wxWindow& window, const wxPoint& pos);
+    virtual bool PlayFrame(int frame, wxWindow& window, wxPoint& pos);
     virtual bool PlayFrame();
     virtual void DrawFrame(int frame, wxDC& dc, const wxPoint& pos);
     virtual void DrawBackground(wxDC& dc, const wxPoint& pos, const wxColour& colour);

contrib/include/wx/fl/controlbar.h

@@ -239,7 +239,7 @@ public:
                          int alignment    = FL_ALIGN_TOP,
                          int rowNo        = 0,
                          int columnPos    = 0,
-                         const wxString& name = wxT("bar"),
+                         const wxString& name="bar",
                          bool spyEvents    = FALSE,
                          int state        = wxCBAR_DOCKED_HORIZONTALLY
                        );

contrib/include/wx/fl/dyntbar.h

@@ -148,12 +148,12 @@ public:
     virtual void AddTool( int toolIndex,
                               const wxString& imageFileName,
                               wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
-                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
+                              const wxString& labelText = "", bool alignTextRight = FALSE,
                               bool isFlat = TRUE );
         // Adds a tool. See the documentation for wxToolBar for details.
 
     virtual void AddTool( int toolIndex, wxBitmap labelBmp,
-                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
+                              const wxString& labelText = "", bool alignTextRight = FALSE,
                               bool isFlat = TRUE );
 
     // Method from wxToolBarBase (for compatibility), only
@@ -162,7 +162,7 @@ public:
 
     virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
                const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
-               const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
+               const wxString& helpString1 = "", const wxString& helpString2 = "");
 
         // Adds a separator. See the documentation for wxToolBar for details.
 

contrib/include/wx/fl/newbmpbtn.h

@@ -110,7 +110,7 @@ public:
 
         // Constructor.
     wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap,
-                       const wxString& labelText   = wxT(""),
+                       const wxString& labelText   = "",
                        int   alignText             = NB_ALIGN_TEXT_BOTTOM,
                        bool  isFlat                = TRUE,
                        // this is the default type of fired events
@@ -124,7 +124,7 @@ public:
         // Use this constructor if buttons have to be persistant
     wxNewBitmapButton( const wxString& bitmapFileName,
                            const wxBitmapType     bitmapFileType = wxBITMAP_TYPE_BMP,
-                           const wxString& labelText      = wxT(""),
+                           const wxString& labelText      = "",
                            int alignText                  = NB_ALIGN_TEXT_BOTTOM,
                            bool  isFlat                   = TRUE,
                            // this is the default type of fired events
@@ -143,7 +143,7 @@ public:
     virtual void Reshape();
 
         // Sets the label and optionally label text.
-    virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = wxT("") );
+    virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = "" );
 
         // Sets the text alignment and margins.
     virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM,

contrib/include/wx/stc/stc.h

@@ -77,9 +77,6 @@
 // The SC_CP_UTF8 value can be used to enter Unicode mode.
 // This is the same value as CP_UTF8 in Windows
 #define wxSTC_CP_UTF8 65001
-
-// The SC_CP_DBCS value can be used to indicate a DBCS mode for GTK+.
-#define wxSTC_CP_DBCS 1
 #define wxSTC_MARKER_MAX 31
 #define wxSTC_MARK_CIRCLE 0
 #define wxSTC_MARK_ROUNDRECT 1
@@ -110,7 +107,6 @@
 #define wxSTC_MARK_BACKGROUND 22
 #define wxSTC_MARK_DOTDOTDOT 23
 #define wxSTC_MARK_ARROWS 24
-#define wxSTC_MARK_PIXMAP 25
 #define wxSTC_MARK_CHARACTER 10000
 
 // Markers used for outlining column.
@@ -189,21 +185,10 @@
 #define wxSTC_FIND_MATCHCASE 4
 #define wxSTC_FIND_WORDSTART 0x00100000
 #define wxSTC_FIND_REGEXP 0x00200000
-#define wxSTC_FIND_POSIX 0x00400000
 #define wxSTC_FOLDLEVELBASE 0x400
 #define wxSTC_FOLDLEVELWHITEFLAG 0x1000
 #define wxSTC_FOLDLEVELHEADERFLAG 0x2000
-#define wxSTC_FOLDLEVELBOXHEADERFLAG 0x4000
-#define wxSTC_FOLDLEVELBOXFOOTERFLAG 0x8000
-#define wxSTC_FOLDLEVELCONTRACTED 0x10000
-#define wxSTC_FOLDLEVELUNINDENT 0x20000
 #define wxSTC_FOLDLEVELNUMBERMASK 0x0FFF
-#define wxSTC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002
-#define wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004
-#define wxSTC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008
-#define wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010
-#define wxSTC_FOLDFLAG_LEVELNUMBERS 0x0040
-#define wxSTC_FOLDFLAG_BOX 0x0001
 #define wxSTC_TIME_FOREVER 10000000
 #define wxSTC_WRAP_NONE 0
 #define wxSTC_WRAP_WORD 1
@@ -215,7 +200,7 @@
 #define wxSTC_EDGE_LINE 1
 #define wxSTC_EDGE_BACKGROUND 2
 #define wxSTC_CURSORNORMAL -1
-#define wxSTC_CURSORWAIT 4
+#define wxSTC_CURSORWAIT 3
 
 // Constants for use with SetVisiblePolicy, similar to SetCaretPolicy.
 #define wxSTC_VISIBLE_SLOP 0x01
@@ -323,12 +308,6 @@
 #define wxSTC_LEX_BAAN 31
 #define wxSTC_LEX_MATLAB 32
 #define wxSTC_LEX_SCRIPTOL 33
-#define wxSTC_LEX_ASM 34
-#define wxSTC_LEX_CPPNOCASE 35
-#define wxSTC_LEX_FORTRAN 36
-#define wxSTC_LEX_F77 37
-#define wxSTC_LEX_CSS 38
-#define wxSTC_LEX_POV 39
 
 // When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 // value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -597,9 +576,6 @@
 #define wxSTC_ERR_DIFF_ADDITION 11
 #define wxSTC_ERR_DIFF_DELETION 12
 #define wxSTC_ERR_DIFF_MESSAGE 13
-#define wxSTC_ERR_PHP 14
-#define wxSTC_ERR_ELF 15
-#define wxSTC_ERR_IFC 16
 
 // Lexical states for SCLEX_BATCH
 #define wxSTC_BAT_DEFAULT 0
@@ -646,31 +622,24 @@
 #define wxSTC_AVE_COMMENT 1
 #define wxSTC_AVE_NUMBER 2
 #define wxSTC_AVE_WORD 3
+#define wxSTC_AVE_KEYWORD 4
+#define wxSTC_AVE_STATEMENT 5
 #define wxSTC_AVE_STRING 6
 #define wxSTC_AVE_ENUM 7
 #define wxSTC_AVE_STRINGEOL 8
 #define wxSTC_AVE_IDENTIFIER 9
 #define wxSTC_AVE_OPERATOR 10
-#define wxSTC_AVE_WORD1 11
-#define wxSTC_AVE_WORD2 12
-#define wxSTC_AVE_WORD3 13
-#define wxSTC_AVE_WORD4 14
-#define wxSTC_AVE_WORD5 15
-#define wxSTC_AVE_WORD6 16
 
 // Lexical states for SCLEX_ADA
 #define wxSTC_ADA_DEFAULT 0
-#define wxSTC_ADA_WORD 1
+#define wxSTC_ADA_COMMENT 1
-#define wxSTC_ADA_IDENTIFIER 2
+#define wxSTC_ADA_NUMBER 2
-#define wxSTC_ADA_NUMBER 3
+#define wxSTC_ADA_WORD 3
-#define wxSTC_ADA_DELIMITER 4
+#define wxSTC_ADA_STRING 4
 #define wxSTC_ADA_CHARACTER 5
-#define wxSTC_ADA_CHARACTEREOL 6
+#define wxSTC_ADA_OPERATOR 6
-#define wxSTC_ADA_STRING 7
+#define wxSTC_ADA_IDENTIFIER 7
 #define wxSTC_ADA_STRINGEOL 8
-#define wxSTC_ADA_LABEL 9
-#define wxSTC_ADA_COMMENTLINE 10
-#define wxSTC_ADA_ILLEGAL 11
 
 // Lexical states for SCLEX_BAAN
 #define wxSTC_BAAN_DEFAULT 0
@@ -751,66 +720,6 @@
 #define wxSTC_SCRIPTOL_COMMENTDOCKEYWORDERROR 18
 #define wxSTC_SCRIPTOL_COMMENTBASIC 19
 
-// Lexical states for SCLEX_ASM
-#define wxSTC_ASM_DEFAULT 0
-#define wxSTC_ASM_COMMENT 1
-#define wxSTC_ASM_NUMBER 2
-#define wxSTC_ASM_STRING 3
-#define wxSTC_ASM_OPERATOR 4
-#define wxSTC_ASM_IDENTIFIER 5
-#define wxSTC_ASM_CPUINSTRUCTION 6
-#define wxSTC_ASM_MATHINSTRUCTION 7
-#define wxSTC_ASM_REGISTER 8
-#define wxSTC_ASM_DIRECTIVE 9
-#define wxSTC_ASM_DIRECTIVEOPERAND 10
-
-// Lexical states for SCLEX_FORTRAN
-#define wxSTC_F_DEFAULT 0
-#define wxSTC_F_COMMENT 1
-#define wxSTC_F_NUMBER 2
-#define wxSTC_F_STRING1 3
-#define wxSTC_F_STRING2 4
-#define wxSTC_F_STRINGEOL 5
-#define wxSTC_F_OPERATOR 6
-#define wxSTC_F_IDENTIFIER 7
-#define wxSTC_F_WORD 8
-#define wxSTC_F_WORD2 9
-#define wxSTC_F_WORD3 10
-#define wxSTC_F_PREPROCESSOR 11
-#define wxSTC_F_OPERATOR2 12
-#define wxSTC_F_LABEL 13
-#define wxSTC_F_CONTINUATION 14
-
-// Lexical states for SCLEX_CSS
-#define wxSTC_CSS_DEFAULT 0
-#define wxSTC_CSS_TAG 1
-#define wxSTC_CSS_CLASS 2
-#define wxSTC_CSS_PSEUDOCLASS 3
-#define wxSTC_CSS_UNKNOWN_PSEUDOCLASS 4
-#define wxSTC_CSS_OPERATOR 5
-#define wxSTC_CSS_IDENTIFIER 6
-#define wxSTC_CSS_UNKNOWN_IDENTIFIER 7
-#define wxSTC_CSS_VALUE 8
-#define wxSTC_CSS_COMMENT 9
-#define wxSTC_CSS_ID 10
-#define wxSTC_CSS_IMPORTANT 11
-#define wxSTC_CSS_DIRECTIVE 12
-#define wxSTC_CSS_DOUBLESTRING 13
-#define wxSTC_CSS_SINGLESTRING 14
-
-// Lexical states for SCLEX_POV
-#define wxSTC_POV_DEFAULT 0
-#define wxSTC_POV_COMMENT 1
-#define wxSTC_POV_COMMENTLINE 2
-#define wxSTC_POV_COMMENTDOC 3
-#define wxSTC_POV_NUMBER 4
-#define wxSTC_POV_WORD 5
-#define wxSTC_POV_STRING 6
-#define wxSTC_POV_OPERATOR 7
-#define wxSTC_POV_IDENTIFIER 8
-#define wxSTC_POV_BRACE 9
-#define wxSTC_POV_WORD2 10
-
 
 //-----------------------------------------
 // Commands that can be bound to keystrokes
@@ -958,9 +867,6 @@
 // Switch the current line with the previous.
 #define wxSTC_CMD_LINETRANSPOSE 2339
 
-// Duplicate the current line.
-#define wxSTC_CMD_LINEDUPLICATE 2404
-
 // Transform the selection to lower case.
 #define wxSTC_CMD_LOWERCASE 2340
 
@@ -991,18 +897,6 @@
 // caret position.
 #define wxSTC_CMD_LINEENDDISPLAYEXTEND 2348
 
-// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-// except they behave differently when word-wrap is enabled:
-// They go first to the start / end of the display line, like (Home|LineEnd)Display
-// The difference is that, the cursor is already at the point, it goes on to the start
-// or end of the document line, as appropriate for (Home|LineEnd|VCHome)Extend.
-#define wxSTC_CMD_HOMEWRAP 2349
-#define wxSTC_CMD_HOMEWRAPEXTEND 2450
-#define wxSTC_CMD_LINEENDWRAP 2451
-#define wxSTC_CMD_LINEENDWRAPEXTEND 2452
-#define wxSTC_CMD_VCHOMEWRAP 2453
-#define wxSTC_CMD_VCHOMEWRAPEXTEND 2454
-
 // Move to the previous change in capitalisation.
 #define wxSTC_CMD_WORDPARTLEFT 2390
 
@@ -1023,12 +917,6 @@
 // Delete forwards from the current position to the end of the line.
 #define wxSTC_CMD_DELLINERIGHT 2396
 
-// Move caret between paragraphs (delimited by empty lines)
-#define wxSTC_CMD_PARADOWN 2413
-#define wxSTC_CMD_PARADOWNEXTEND 2414
-#define wxSTC_CMD_PARAUP 2415
-#define wxSTC_CMD_PARAUPEXTEND 2416
-
 
 // END of generated section
 //----------------------------------------------------------------------
@@ -1203,8 +1091,8 @@ public:
     // Set the symbol used for a particular marker number,
     // and optionally the fore and background colours.
     void MarkerDefine(int markerNumber, int markerSymbol,
-                const wxColour& foreground = wxNullColour,
+                         const wxColour& foreground = wxNullColour,
-                const wxColour& background = wxNullColour);
+                         const wxColour& background = wxNullColour);
 
     // Set the foreground colour used for a particular marker number.
     void MarkerSetForeground(int markerNumber, const wxColour& fore);
@@ -1230,9 +1118,6 @@ public:
     // Find the previous line before lineStart that includes a marker in mask.
     int MarkerPrevious(int lineStart, int markerMask);
 
-    // Define a marker from a bitmap
-    void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
-
     // Set a margin to be either numeric or symbolic.
     void SetMarginType(int margin, int marginType);
 
@@ -1293,9 +1178,6 @@ public:
     // Set the character set of the font in a style.
     void StyleSetCharacterSet(int style, int characterSet);
 
-    // Set a style to be a hotspot or not.
-    void StyleSetHotSpot(int style, bool hotspot);
-
     // Set the foreground colour of the selection and whether to use this setting.
     void SetSelForeground(bool useSetting, const wxColour& fore);
 
@@ -1457,19 +1339,6 @@ public:
     // after the inserted text upon completion.
     bool AutoCompGetDropRestOfWord();
 
-    // Register an image for use in autocompletion lists.
-    void RegisterImage(int type, const wxBitmap& bmp);
-
-    // Clear all the registered images.
-    void ClearRegisteredImages();
-
-    // Retrieve the auto-completion list type-separator character.
-    int AutoCompGetTypeSeparator();
-
-    // Change the type-separator character in the string setting up an auto-completion list.
-    // Default is '?' but can be changed if items contain '?'.
-    void AutoCompSetTypeSeparator(int separatorCharacter);
-
     // Set the number of spaces used for one level of indentation.
     void SetIndent(int indentSize);
 
@@ -1558,14 +1427,14 @@ public:
 
     // On Windows, will draw the document into a display context such as a printer.
     int FormatRange(bool   doDraw,
-               int    startPos,
+                               int    startPos,
-               int    endPos,
+                               int    endPos,
-               wxDC*  draw,
+                               wxDC*  draw,
-               wxDC*  target,  // Why does it use two? Can they be the same?
+                               wxDC*  target,  // Why does it use two? Can they be the same?
-               wxRect renderRect,
+                               wxRect renderRect,
-               wxRect pageRect);
+                               wxRect pageRect);
 
-    // Retrieve the display line at the top of the display.
+    // Retrieve the line at the top of the display.
     int GetFirstVisibleLine();
 
     // Retrieve the contents of a line.
@@ -1720,12 +1589,6 @@ public:
     // Set the background colour for the call tip.
     void CallTipSetBackground(const wxColour& back);
 
-    // Set the foreground colour for the call tip.
-    void CallTipSetForeground(const wxColour& fore);
-
-    // Set the foreground colour for the highlighted part of the call tip.
-    void CallTipSetForegroundHighlight(const wxColour& fore);
-
     // Find the display line of a document line taking hidden lines into account.
     int VisibleFromDocLine(int line);
 
@@ -1767,7 +1630,7 @@ public:
     // Ensure a particular line is visible by expanding any header line hiding it.
     void EnsureVisible(int line);
 
-    // Set some style options for folding.
+    // Set some debugging options for folding.
     void SetFoldFlags(int flags);
 
     // Ensure a particular line is visible by expanding any header line hiding it.
@@ -1833,39 +1696,6 @@ public:
     // Retrieve the height of a particular line of text in pixels.
     int TextHeight(int line);
 
-    // Show or hide the vertical scroll bar.
-    void SetUseVerticalScrollBar(bool show);
-
-    // Is the vertical scroll bar visible?
-    bool GetUseVerticalScrollBar();
-
-    // Append a string to the end of the document without changing the selection.
-    void AppendText(int length, const wxString& text);
-
-    // Is drawing done in two phases with backgrounds drawn before foregrounds?
-    bool GetTwoPhaseDraw();
-
-    // In twoPhaseDraw mode, drawing is performed in two phases, first the background
-    // and then the foreground. This avoids chopping off characters that overlap the next run.
-    void SetTwoPhaseDraw(bool twoPhase);
-
-    // Make the target range start and end be the same as the selection range start and end.
-    void TargetFromSelection();
-
-    // Join the lines in the target.
-    void LinesJoin();
-
-    // Split the lines in the target into lines that are less wide than pixelWidth
-    // where possible.
-    void LinesSplit(int pixelWidth);
-
-    // Set the colours used as a chequerboard pattern in the fold margin
-    void SetFoldMarginColour(bool useSetting, const wxColour& back);
-    void SetFoldMarginHiColour(bool useSetting, const wxColour& fore);
-
-    // Duplicate the current line.
-    void LineDuplicate();
-
     // Move caret to first position on display line.
     void HomeDisplay();
 
@@ -2030,9 +1860,6 @@ public:
     void SetXOffset(int newOffset);
     int GetXOffset();
 
-    // Set the last x chosen value to be the caret x position
-    void ChooseCaretX();
-
     // Set the way the caret is kept visible when going sideway.
     // The exclusion zone is given in pixels.
     void SetXCaretPolicy(int caretPolicy, int caretSlop);
@@ -2041,21 +1868,6 @@ public:
     // The exclusion zone is given in lines.
     void SetYCaretPolicy(int caretPolicy, int caretSlop);
 
-    // Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
-    void SetPrintWrapMode(int mode);
-
-    // Is printing line wrapped.
-    int GetPrintWrapMode();
-
-    // Set a fore colour for active hotspots.
-    void SetHotspotActiveForeground(bool useSetting, const wxColour& fore);
-
-    // Set a back colour for active hotspots.
-    void SetHotspotActiveBackground(bool useSetting, const wxColour& back);
-
-    // Enable / Disable underlining active hotspots.
-    void SetHotspotActiveUnderline(bool underline);
-
     // Start notifying the container of all key presses and commands.
     void StartRecord();
 
@@ -2161,12 +1973,6 @@ public:
     bool GetLastKeydownProcessed() { return m_lastKeyDownConsumed; }
     void SetLastKeydownProcessed(bool val) { m_lastKeyDownConsumed = val; }
 
-    // Write the contents of the editor to filename
-    bool SaveFile(const wxString& filename);
-
-    // Load the contents of filename into the editor
-    bool LoadFile(const wxString& filename);
-
 
 //----------------------------------------------------------------------
 
@@ -2199,11 +2005,11 @@ private:
     void NotifyChange();
     void NotifyParent(SCNotification* scn);
 
+
+private:
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxStyledTextCtrl)
 
-protected:
-
     ScintillaWX*        m_swx;
     wxStopWatch         m_stopWatch;
     wxScrollBar*        m_vScrollBar;
@@ -2322,8 +2128,6 @@ private:
 #endif
 };
 
-
-
 #ifndef SWIG
 BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHANGE,                  1650)
@@ -2349,9 +2153,6 @@ BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DRAG_OVER,               1670)
     DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DO_DROP,                 1671)
     DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_ZOOM,                    1672)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_HOTSPOT_CLICK,           1673)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_HOTSPOT_DCLICK,          1674)
-    DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CALLTIP_CLICK,           1675)
 END_DECLARE_EVENT_TYPES()
 #else
     enum {
@@ -2378,9 +2179,6 @@ END_DECLARE_EVENT_TYPES()
         wxEVT_STC_DRAG_OVER,
         wxEVT_STC_DO_DROP,
         wxEVT_STC_ZOOM,
-        wxEVT_STC_HOTSPOT_CLICK,
-        wxEVT_STC_HOTSPOT_DCLICK,
-        wxEVT_STC_CALLTIP_CLICK
     };
 #endif
 
@@ -2412,10 +2210,6 @@ typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
 #define EVT_STC_DRAG_OVER(id, fn)               DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER,             id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
 #define EVT_STC_DO_DROP(id, fn)                 DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP,               id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
 #define EVT_STC_ZOOM(id, fn)                    DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ZOOM,                  id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_CLICK(id, fn)           DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_CLICK,         id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_DCLICK(id, fn)          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_DCLICK,        id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-#define EVT_STC_CALLTIP_CLICK(id, fn))          DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CALLTIP_CLICK          id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
-
 #endif
 
 //----------------------------------------------------------------------

contrib/include/wx/xrc/xh_all.h

@@ -47,7 +47,5 @@
 #include "wx/xrc/xh_gdctl.h"
 #include "wx/xrc/xh_frame.h"
 #include "wx/xrc/xh_scwin.h"
-#include "wx/xrc/xh_split.h"
-#include "wx/xrc/xh_wizrd.h"
 
 #endif // _WX_XMLRES_H_

contrib/include/wx/xrc/xh_split.h

@@ -1,28 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_split.h
-// Purpose:     XRC resource for wxSplitterWindow
-// Author:      panga@freemail.hu, Vaclav Slavik
-// Created:     2003/01/26
-// RCS-ID:      $Id$
-// Copyright:   (c) 2003 panga@freemail.hu, Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SPLIT_H_
-#define _WX_XH_SPLIT_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_split.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-class WXXMLDLLEXPORT wxSplitterWindowXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxSplitterWindowXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // _WX_XH_SPLIT_H_

contrib/include/wx/xrc/xh_wizrd.h

@@ -1,38 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        xh_wizrd.h
-// Purpose:     XML resource handler for wxWizard
-// Author:      Vaclav Slavik
-// Created:     2003/03/02
-// RCS-ID:      $Id$
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_WIZRD_H_
-#define _WX_XH_WIZRDL_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_wizrd.h"
-#endif
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_WIZARDDLG
-
-#include "wx/wizard.h"
-
-class WXXMLDLLEXPORT wxWizardXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxWizardXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    wxWizard *m_wizard;
-    wxWizardPageSimple *m_lastSimplePage;
-};
-
-#endif
-
-#endif // _WX_XH_PANEL_H_

contrib/include/wx/xrc/xmlres.h

@@ -240,18 +240,8 @@ protected:
     wxXmlNode *DoFindResource(wxXmlNode *parent, const wxString& name, const wxString& classname, bool recursive);
 
     // Creates a resource from information in the given node.
-    wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent,
+    wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);
-                                wxObject *instance = NULL);
 
-    // Creates a resource from information in the given node
-    // (Uses only 'handlerToUse' if != NULL)
-    //
-    // ATTENTION: Do *NOT* use this function, it will disappear in
-    //            wxWindows 2.5.0! It exists *only* as a hack to preserve
-    //            binary compatibility in 2.4.x branch.
-    wxObject *CreateResFromNode2(wxXmlNode *node, wxObject *parent,
-                                 wxObject *instance = NULL,
-                                 wxXmlResourceHandler *handlerToUse = NULL);
 private:
     long m_version;
 

contrib/samples/animate/AniTestVC.dsp

@@ -111,7 +111,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib animd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/anitest.exe" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib animd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/anitest.exe" /pdbtype:sept /libpath:"../../../lib"
 
 !ELSEIF  "$(CFG)" == "AniTestVC - Win32 Release DLL"
 
@@ -138,7 +138,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/anitest.exe" /libpath:"../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/anitest.exe" /libpath:"../../../lib"
 
 !ELSEIF  "$(CFG)" == "AniTestVC - Win32 UnivRelease"
 

contrib/samples/animate/makefile.wat

@@ -7,6 +7,7 @@
 
 WXDIR = $(%WXWIN)
 EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\animate
 
 PROGRAM = anitest
 EXTRALIBS = $(WXDIR)\lib\anim_w.lib

contrib/samples/canvas/simple/SimpleVC.dsp

@@ -109,7 +109,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/simple.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/simple.exe" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "SimpleVC - Win32 Release DLL"
 
@@ -136,7 +136,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/simple.exe" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/canvas/test/TestVC.dsp

@@ -109,7 +109,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/test.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/test.exe" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "TestVC - Win32 Release DLL"
 
@@ -136,7 +136,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/test.exe" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/test.exe" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/fl/fl_demo1/fl_demo.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "fl_demo1 - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/fl/fl_demo2/fl_demo.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "fl_demo2 - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/fl/fl_demo2/fl_demo2.h

@@ -153,7 +153,7 @@ public:
     void OnMouseUp( wxMouseEvent& event );
     void OnPaint( wxPaintEvent& event );
     
-    DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE();
 };
 
 #endif

contrib/samples/fl/fl_sample1/fl_demo.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "fl_sample1 - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/fl/fl_sample2/fl_demo.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "fl_sample2 - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/fl/fl_sample3/fl_demo.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "fl_sample3 - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/gizmos/dynsash/dynsash.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxmsw24d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dynsash.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 wxmsw240d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dynsash.exe" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "dynsash - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wxmsw24.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dynsash.exe" /libpath:"../../../../lib"
+# ADD LINK32 wxmsw240.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dynsash.exe" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxmsw24d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dynsash_switch.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 wxmsw240d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dynsash_switch.exe" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "dynsash_switch - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wxmsw24.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dynsash_switch.exe" /libpath:"../../../../lib"
+# ADD LINK32 wxmsw240.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dynsash_switch.exe" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/gizmos/editlbox/editlbox.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxmsw24d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/editlbox.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 wxmsw240d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/editlbox.exe" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "editlbox - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wxmsw24.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/editlbox.exe" /libpath:"../../../../lib"
+# ADD LINK32 wxmsw240.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/editlbox.exe" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/gizmos/multicell/makefile.bcc

@@ -0,0 +1,15 @@
+# Purpose: makefile for multicell example (BC++ 16bit)
+# Created 2000-07-28
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=mtest
+OBJECTS=$(TARGET).obj ..\src\multicell.obj
+EXTRAINC=-I..\include
+
+!include $(WXDIR)\src\makeprog.bcc
+

contrib/samples/gizmos/multicell/makefile.wat

@@ -4,6 +4,9 @@
 WXDIR = $(%WXWIN)
 
 EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\gizmos\multicell
+
+
 PROGRAM = mtest
 EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib
 OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 

contrib/samples/gizmos/multicell/multicell.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxmsw24d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mtest.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 wxmsw240d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mtest.exe" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "multicell - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wxmsw24.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mtest.exe" /libpath:"../../../../lib"
+# ADD LINK32 wxmsw240.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mtest.exe" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/gizmos/splittree/TreeVC.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 wxmsw24d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/tree.exe" /pdbtype:sept /libpath:"../../../../lib"
+# ADD LINK32 wxmsw240d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/tree.exe" /pdbtype:sept /libpath:"../../../../lib"
 
 !ELSEIF  "$(CFG)" == "TreeVC - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 wxmsw24.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/tree.exe" /libpath:"../../../../lib"
+# ADD LINK32 wxmsw240.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/tree.exe" /libpath:"../../../../lib"
 
 !ENDIF 
 

contrib/samples/gizmos/splittree/makefile.bcc

@@ -0,0 +1,19 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+#
+# Builds a BC++ 16-bit sample
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=minimal
+OBJECTS=$(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.bcc
+

contrib/samples/gizmos/splittree/makefile.wat

@@ -4,6 +4,7 @@
 WXDIR = $(%WXWIN)
 
 EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\gizmos\splittree
 
 PROGRAM = tree
 EXTRALIBS = $(WXDIR)\lib\gizmos_w.lib

contrib/samples/mmedia/MMboardVC.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib mmediad.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/mmboard.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "MMboardVC - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib mmedia.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/mmboard.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ENDIF 
 

contrib/samples/mmedia/makefile.b32

@@ -10,7 +10,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=mmboard
-EXTRALIBS=$(WXDIR)\lib\mmedia.lib
+EXTRALIBS=$(WXDIR)\contrib\lib\mmedia.lib
 OBJECTS = $(TARGET).obj mmbman.obj
 
 !include $(WXDIR)\src\makeprog.b32

contrib/samples/mmedia/makefile.bcc

@@ -0,0 +1,20 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+#
+# Builds a BC++ 16-bit sample
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=mmboard
+EXTRALIBS=$(WXDIR)\contrib\lib\mmedia.lib
+OBJECTS=$(TARGET).obj mmbman.obj
+
+!include $(WXDIR)\src\makeprog.bcc
+

contrib/samples/ogl/ogledit/OGLEditVC.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/ogledit.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "OGLEditVC - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib ogl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/ogledit.exe" /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
 
 !ENDIF 
 

contrib/samples/ogl/ogledit/doc.cpp

@@ -92,9 +92,7 @@ wxOutputStream& DiagramDocument::SaveObject(wxOutputStream& stream)
   char buf[400];
   (void) wxGetTempFileName("diag", buf);
 
-#if wxUSE_PROLOGIO
   diagram.SaveFile(buf);
-#endif
 
   wxTransferFileToStream(buf, stream);
 
@@ -115,11 +113,7 @@ wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
   wxTransferStreamToFile(stream, buf);
 
   diagram.DeleteAllShapes();
-
-#if wxUSE_PROLOGIO
   diagram.LoadFile(buf);
-#endif
-
   wxRemoveFile(buf);
 
   return stream;
@@ -554,7 +548,6 @@ void MyEvtHandler::OnEndSize(double x, double y)
  * Diagram
  */
  
-#if wxUSE_PROLOGIO
 bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
 {
   wxDiagram::OnShapeSave(db, shape, expr);
@@ -575,7 +568,6 @@ bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
     delete[] label;
   return TRUE;
 }
-#endif
 
 /*
  * New shapes

contrib/samples/ogl/ogledit/doc.h

@@ -35,10 +35,8 @@ class MyDiagram: public wxDiagram
 {
  public:
   MyDiagram(void) {}
-#if wxUSE_PROLOGIO
   bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
   bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-#endif
 };
 
 /*

contrib/samples/ogl/ogledit/makefile.bcc

@@ -0,0 +1,20 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+#
+# Builds a BC++ 16-bit sample
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=ogledit
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
+OBJECTS = $(TARGET).obj doc.obj view.obj palette.obj
+
+!include $(WXDIR)\src\makeprog.b32
+

contrib/samples/ogl/ogledit/makefile.wat

@@ -8,6 +8,7 @@
 WXDIR = $(%WXWIN)
 
 EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\ogl\ogledit
 
 PROGRAM = ogledit
 EXTRALIBS = $(WXDIR)\lib\ogl_w.lib

contrib/samples/ogl/studio/StudioVC.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib ogld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/studio.exe" /pdbtype:sept /libpath:"../../../../lib" /libpath:"../../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "StudioVC - Win32 Release DLL"
 

contrib/samples/ogl/studio/dialogs.cpp

@@ -25,11 +25,6 @@
 #endif
 
 #include <wx/resource.h>
-
-#if !wxUSE_WX_RESOURCES 
-#error "OGL studio sample requires wxUSE_WX_RESOURCES" 
-#endif // wxUSE_WX_RESOURCES 
-
 #include "dialogs.h"
 #include "doc.h"
 #include "view.h"

contrib/samples/ogl/studio/doc.cpp

@@ -60,7 +60,6 @@ bool csDiagramDocument::OnSaveDocument(const wxString& file)
   if (file == "")
     return FALSE;
 
-#if wxUSE_PROLOGIO
   if (!m_diagram.SaveFile(file))
   {
     wxString msgTitle;
@@ -73,7 +72,6 @@ bool csDiagramDocument::OnSaveDocument(const wxString& file)
       GetDocumentWindow());
     return FALSE;
   }
-#endif
 
   Modify(FALSE);
   SetFilename(file);
@@ -92,14 +90,12 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file)
     msgTitle = wxString("File error");
 
   m_diagram.DeleteAllShapes();
-#if wxUSE_PROLOGIO
   if (!m_diagram.LoadFile(file))
   {
     (void)wxMessageBox("Sorry, could not open this file.", msgTitle, wxOK|wxICON_EXCLAMATION,
      GetDocumentWindow());
     return FALSE;
   }
-#endif
   SetFilename(file, TRUE);
   Modify(FALSE);
   UpdateAllViews();

contrib/samples/ogl/studio/makefile.bcc

@@ -0,0 +1,21 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+#
+# Builds a BC++ 16-bit sample
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+TARGET=studio
+EXTRALIBS=$(WXDIR)\lib\ogl.lib
+OBJECTS = $(TARGET).obj doc.obj shapes.obj symbols.obj view.obj cspalette.obj\
+  mainfrm.obj project.obj dialogs.obj csprint.obj
+
+!include $(WXDIR)\src\makeprog.bcc
+

contrib/samples/ogl/studio/makefile.wat

@@ -8,6 +8,7 @@
 WXDIR = $(%WXWIN)
 
 EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+THISDIR = $(WXDIR)\contrib\samples\ogl\studio
 
 PROGRAM = studio
 EXTRALIBS = $(WXDIR)\lib\ogl_w.lib

contrib/samples/ogl/studio/shapes.cpp

@@ -705,7 +705,6 @@ bool csEvtHandler::EditProperties()
  * Diagram
  */
  
-#if wxUSE_PROLOGIO
 bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
 {
   wxDiagram::OnShapeSave(db, shape, expr);
@@ -724,7 +723,6 @@ bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
   
   return TRUE;
 }
-#endif
 
 IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape)
 

contrib/samples/ogl/studio/shapes.h

@@ -37,10 +37,8 @@ DECLARE_CLASS(csDiagram)
 public:
     csDiagram(csDiagramDocument* doc) { m_doc = doc; }
     ~csDiagram();
-#if wxUSE_PROLOGIO
     bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
     bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
-#endif
 
     inline csDiagramDocument* GetDocument() const { return m_doc; }
     virtual void Redraw(wxDC& dc);

contrib/samples/ogl/studio/studio.cpp

@@ -25,10 +25,6 @@
 #include "wx/config.h"
 #include "wx/laywin.h"
 
-#if !wxUSE_WX_RESOURCES 
-#error "OGL studio sample requires wxUSE_WX_RESOURCES" 
-#endif // wxUSE_WX_RESOURCES 
-
 #include "studio.h"
 #include "view.h"
 #include "doc.h"

contrib/samples/plot/PlotVC.dsp

@@ -109,7 +109,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/plot.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib plotd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/plot.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "PlotVC - Win32 Release DLL"
 
@@ -136,7 +136,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib plot.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/plot.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ENDIF 
 

contrib/samples/stc/StcTestVC.dsp

@@ -108,7 +108,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib stcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/stctest.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "StcTestVC - Win32 Release DLL"
 
@@ -135,7 +135,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib stc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/stctest.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ENDIF 
 

contrib/samples/stc/makefile.b32

@@ -11,7 +11,7 @@ WXDIR = $(WXWIN)
 
 TARGET=stctest
 
-EXTRALIBS=$(WXDIR)\lib\stc.lib
+EXTRALIBS=$(WXDIR)\contrib\lib\stc.lib
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.b32

contrib/samples/stc/makefile.wat

@@ -1,13 +0,0 @@
-# Purpose: makefile for SVG example (Watcom)
-# Created 2000-07-28
-
-WXDIR = $(%WXWIN)
-
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-PROGRAM = stctest
-EXTRALIBS = $(WXDIR)\lib\stc_w.lib
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
-
-!include $(WXDIR)\src\makeprog.wat
-
-

contrib/samples/stc/stctest.cpp

@@ -40,26 +40,7 @@ public:
 };
 
 //----------------------------------------------------------------------
-//  Make an editor class
 
-class MySTC : public wxStyledTextCtrl
-{
-public:
-    MySTC(wxWindow *parent, wxWindowID id,
-          const wxPoint& pos = wxDefaultPosition,
-          const wxSize& size = wxDefaultSize, long style = 0);
-
-    void OnKeyPressed(wxKeyEvent& evt);
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(MySTC, wxStyledTextCtrl)
-    EVT_KEY_DOWN(MySTC::OnKeyPressed)
-END_EVENT_TABLE()
-
-//----------------------------------------------------------------------
 // Define a new frame type: this is going to be our main frame
 class MyFrame : public wxFrame
 {
@@ -70,7 +51,7 @@ public:
     void OnAbout(wxCommandEvent& event);
 
 private:
-    MySTC* ed;
+    wxStyledTextCtrl* ed;
 
     DECLARE_EVENT_TABLE()
 };
@@ -97,8 +78,8 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
-    MyFrame *frame = new MyFrame(_T("Testing wxStyledTextCtrl"),
+    MyFrame *frame = new MyFrame("Testing wxStyledTextCtrl",
-                                 wxPoint(5, 5), wxSize(600, 600));
+                                 wxPoint(5, 5), wxSize(400, 600));
 
     frame->Show(TRUE);
     return TRUE;
@@ -118,31 +99,81 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 
     // create a menu bar
-    wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(ID_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
+    helpMenu->Append(ID_About, "&About...\tCtrl-A", "Show about dialog");
 
-    menuFile->Append(ID_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
+    menuFile->Append(ID_Quit, "E&xit\tAlt-X", "Quit this program");
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(menuFile, _T("&File"));
+    menuBar->Append(menuFile, "&File");
-    menuBar->Append(helpMenu, _T("&Help"));
+    menuBar->Append(helpMenu, "&Help");
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
 #if wxUSE_STATUSBAR
     CreateStatusBar(2);
-    SetStatusText(_T("Testing wxStyledTextCtrl"));
+    SetStatusText("Testing wxStyledTextCtrl");
 #endif // wxUSE_STATUSBAR
 
 
     //----------------------------------------
     // Setup the editor
-    ed = new MySTC(this, ID_ED);
+    ed = new wxStyledTextCtrl(this, ID_ED);
+
+    // Default font
+    wxFont font(10, wxMODERN, wxNORMAL, wxNORMAL);
+    ed->StyleSetFont(wxSTC_STYLE_DEFAULT, font);
+    ed->StyleClearAll();
+
+    ed->StyleSetForeground(0,  wxColour(0x80, 0x80, 0x80));
+    ed->StyleSetForeground(1,  wxColour(0x00, 0x7f, 0x00));
+    //ed->StyleSetForeground(2,  wxColour(0x00, 0x7f, 0x00));
+    ed->StyleSetForeground(3,  wxColour(0x7f, 0x7f, 0x7f));
+    ed->StyleSetForeground(4,  wxColour(0x00, 0x7f, 0x7f));
+    ed->StyleSetForeground(5,  wxColour(0x00, 0x00, 0x7f));
+    ed->StyleSetForeground(6,  wxColour(0x7f, 0x00, 0x7f));
+    ed->StyleSetForeground(7,  wxColour(0x7f, 0x00, 0x7f));
+    ed->StyleSetForeground(8,  wxColour(0x00, 0x7f, 0x7f));
+    ed->StyleSetForeground(9,  wxColour(0x7f, 0x7f, 0x7f));
+    ed->StyleSetForeground(10, wxColour(0x00, 0x00, 0x00));
+    ed->StyleSetForeground(11, wxColour(0x00, 0x00, 0x00));
+    ed->StyleSetBold(5,  TRUE);
+    ed->StyleSetBold(10, TRUE);
+
+#ifdef __WXMSW__
+    ed->StyleSetSpec(2, "fore:#007f00,bold,face:Arial,size:9");
+#else
+    ed->StyleSetSpec(2, "fore:#007f00,bold,face:Helvetica,size:9");
+#endif
+
+    // give it some text to play with
+    wxFile   file("stctest.cpp");
+    wxString st;
+
+    char* buff = st.GetWriteBuf(file.Length());
+    file.Read(buff, file.Length());
+    st.UngetWriteBuf();
+
+    ed->InsertText(0, st);
+    ed->EmptyUndoBuffer();
+
+    ed->SetLexer(wxSTC_LEX_CPP);
+    ed->SetKeyWords(0,
+                    "asm auto bool break case catch char class const "
+                    "const_cast continue default delete do double "
+                    "dynamic_cast else enum explicit export extern "
+                    "false float for friend goto if inline int long "
+                    "mutable namespace new operator private protected "
+                    "public register reinterpret_cast return short signed "
+                    "sizeof static static_cast struct switch template this "
+                    "throw true try typedef typeid typename union unsigned "
+                    "using virtual void volatile wchar_t while");
+
 }
 
 
@@ -159,96 +190,5 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
     wxString msg;
     msg.Printf( _T("Testing wxStyledTextCtrl...\n"));
 
-    wxMessageBox(msg, _T("About This Test"), wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(msg, "About This Test", wxOK | wxICON_INFORMATION, this);
-}
-
-
-//----------------------------------------------------------------------
-
-wxChar* keywords =
-_T("asm auto bool break case catch char class const \
-const_cast continue default delete do double \
-dynamic_cast else enum explicit export extern \
-false float for friend goto if inline int long \
-mutable namespace new operator private protected \
-public register reinterpret_cast return short signed \
-sizeof static static_cast struct switch template this \
-throw true try typedef typeid typename union unsigned \
-using virtual void volatile wchar_t while");
-
-
-
-MySTC::MySTC(wxWindow *parent, wxWindowID id,
-             const wxPoint& pos, const wxSize& size,
-             long style)
-    : wxStyledTextCtrl(parent, id, pos, size, style)
-{
-    // Default font
-    wxFont font(10, wxMODERN, wxNORMAL, wxNORMAL);
-    StyleSetFont(wxSTC_STYLE_DEFAULT, font);
-    StyleClearAll();
-
-    StyleSetForeground(0,  wxColour(0x80, 0x80, 0x80));
-    StyleSetForeground(1,  wxColour(0x00, 0x7f, 0x00));
-    //StyleSetForeground(2,  wxColour(0x00, 0x7f, 0x00));
-    StyleSetForeground(3,  wxColour(0x7f, 0x7f, 0x7f));
-    StyleSetForeground(4,  wxColour(0x00, 0x7f, 0x7f));
-    StyleSetForeground(5,  wxColour(0x00, 0x00, 0x7f));
-    StyleSetForeground(6,  wxColour(0x7f, 0x00, 0x7f));
-    StyleSetForeground(7,  wxColour(0x7f, 0x00, 0x7f));
-    StyleSetForeground(8,  wxColour(0x00, 0x7f, 0x7f));
-    StyleSetForeground(9,  wxColour(0x7f, 0x7f, 0x7f));
-    StyleSetForeground(10, wxColour(0x00, 0x00, 0x00));
-    StyleSetForeground(11, wxColour(0x00, 0x00, 0x00));
-    StyleSetBold(5,  TRUE);
-    StyleSetBold(10, TRUE);
-
-#ifdef __WXMSW__
-    StyleSetSpec(2, _T("fore:#007f00,bold,face:Arial,size:9"));
-#else
-    StyleSetSpec(2, _T("fore:#007f00,bold,face:Helvetica,size:9"));
-#endif
-
-    // give it some text to play with
-    wxString st;
-    wxFileInputStream stream(wxT("stctest.cpp"));
-    size_t sz = stream.GetSize();
-    char* buf = new char[sz + 1];
-    stream.Read((void*) buf, stream.GetSize());
-    buf[sz] = 0;
-    st = wxString::FromAscii(buf);
-    delete[] buf;
-
-    InsertText(0, st);
-    EmptyUndoBuffer();
-
-    SetLexer(wxSTC_LEX_CPP);
-    SetKeyWords(0, keywords);
-}
-
-void MySTC::OnKeyPressed(wxKeyEvent& evt)
-{
-    if (CallTipActive())
-        CallTipCancel();
-
-    int key = evt.GetKeyCode();
-    if ( key == WXK_SPACE && evt.ControlDown()) {
-        int pos = GetCurrentPos();
-
-        if (evt.ShiftDown()) {
-            // show how to do CallTips
-            CallTipSetBackground(wxColour(_T("YELLOW")));
-            CallTipShow(pos, _T("lots of of text: blah, blah, blah\n\n"
-                                "show some suff, maybe parameters..\n\n"
-                                "fubar(param1, param2)"));
-        }
-        else {
-            // show how to do AutoComplete
-            AutoCompSetIgnoreCase(false);
-            AutoCompShow(0, keywords);   // reuse the keyword list here
-            // normally you would build a string of completion texts...
-        }
-    }
-    else
-        evt.Skip();
 }

contrib/samples/svg/makefile.wat

@@ -1,13 +0,0 @@
-# Purpose: makefile for SVG example (Watcom)
-# Created 2000-07-28
-
-WXDIR = $(%WXWIN)
-
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-PROGRAM = svgtest
-EXTRALIBS = $(WXDIR)\lib\svg_w.lib
-OBJECTS = $(OUTPUTDIR)\$(PROGRAM).obj 
-
-!include $(WXDIR)\src\makeprog.wat
-
-

contrib/samples/xrc/XrcDemoVC.dsp

@@ -99,8 +99,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX- /Zi /Od /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -110,7 +109,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24d.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240d.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/xmldemo.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ELSEIF  "$(CFG)" == "XrcDemoVC - Win32 Release DLL"
 
@@ -126,7 +125,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX- /O2 /Ob1 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -137,7 +136,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw24.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw240.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/xmldemo.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
 
 !ENDIF 
 

contrib/src/animate/animate.cpp

@@ -212,7 +212,7 @@ bool wxAnimationPlayer::GetTransparentColour(wxColour& col) const
 }
 
 // Play the frame
-bool wxAnimationPlayer::PlayFrame(int frame, wxWindow& window, const wxPoint& pos)
+bool wxAnimationPlayer::PlayFrame(int frame, wxWindow& window, wxPoint& pos)
 {
     wxMemoryDC dc;
     dc.SelectObject(m_backingStore);

contrib/src/animate/makefile.wat

@@ -1,13 +0,0 @@
-# ANIM src makefile for Watcom C++
-
-WXDIR = ..\..\..
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
-
-LIBTARGET = $(WXDIR)\lib\anim_w.lib
-
-OBJECTS =  &
-    $(OUTPUTDIR)\animate.obj &
-
-!include $(WXDIR)\src\makelib.wat
-
-

contrib/src/fl/bardragpl.cpp

@@ -669,7 +669,7 @@ void cbBarDragPlugin::OnLButtonDown( cbLeftDownEvent& event )
 {
 	if ( mBarDragStarted  )
 	{
-		wxMessageBox(wxT("DblClick!"));
+		wxMessageBox("DblClick!");
 	}
 
 	event.Skip();

contrib/src/fl/cbcustom.cpp

@@ -97,8 +97,8 @@ void cbSimpleCustomizationPlugin::OnCustomizeBar( cbCustomizeBarEvent& event )
 
 void cbSimpleCustomizationPlugin::OnCustomizeLayout( cbCustomizeLayoutEvent& event )
 {
-	wxString helpStr1 = wxT("Select this item to show the corresponding control bar");
+	wxString helpStr1 = "Select this item to show the corresponding control bar";
-	wxString helpStr2 = wxT("Select this itme to hide the corresponding control bar");
+	wxString helpStr2 = "Select this itme to hide the corresponding control bar";
 
 	int id = CB_CUSTOMIZE_MENU_FIRST_ITEM_ID;
 
@@ -153,7 +153,7 @@ void cbSimpleCustomizationPlugin::OnMenuItemSelected( wxCommandEvent& event )
 {
 	if ( event.GetId() == mCustMenuItemId )
 	{
-		wxMessageBox(wxT("Customization dialog box is not supported by this plugin yet"));
+		wxMessageBox("Customization dialog box is not supported by this plugin yet");
 
 		return;
 	}

contrib/src/fl/controlbar.cpp

@@ -976,7 +976,7 @@ void wxFrameLayout::RemoveBar( cbBarInfo* pBarInfo )
             return;
         }
     }
-    wxFAIL_MSG(wxT("bar info should be present in the list of all bars of all panes"));
+    wxFAIL_MSG("bar info should be present in the list of all bars of all panes");
 }
 
 bool wxFrameLayout::LocateBar( cbBarInfo* pBarInfo, 
@@ -1483,7 +1483,7 @@ void wxFrameLayout::OnIdle( wxIdleEvent& event )
 
     if ( !focus && mCheckFocusWhenIdle )
     {
-        wxMessageBox(wxT("Hi, no more focus in this app!"));
+        wxMessageBox( "Hi, no more focus in this app!" );
 
         mCheckFocusWhenIdle = FALSE;
         //ShowFloatedWindows( FALSE );
@@ -3015,7 +3015,7 @@ int cbDockPane::GetRowIndex( cbRowInfo* pRow )
             return i;
     }
 
-    wxFAIL_MSG(wxT("Row must be present to call cbDockPane::GetRowIndex()"));
+    wxFAIL_MSG("Row must be present to call cbDockPane::GetRowIndex()");
 
     return 0;
 }
@@ -3063,7 +3063,7 @@ bool cbDockPane::MatchesMask( int paneMask )
         case FL_ALIGN_RIGHT  : thisMask = FL_ALIGN_RIGHT_PANE; break;
 
         default:
-            wxFAIL_MSG(wxT("Bad FL alignment type detected in cbDockPane::MatchesMask()"));
+            wxFAIL_MSG("Bad FL alignment type detected in cbDockPane::MatchesMask()");
     }
 
     return ( thisMask & paneMask ) != 0;

contrib/src/fl/flVC.dsp

@@ -5,7 +5,7 @@
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=flVC - Win32 Debug Unicode DLL
+CFG=flVC - Win32 Release DLL
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -14,7 +14,7 @@ CFG=flVC - Win32 Debug Unicode DLL
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "flVC.mak" CFG="flVC - Win32 Debug Unicode DLL"
+!MESSAGE NMAKE /f "flVC.mak" CFG="flVC - Win32 Release DLL"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -22,10 +22,6 @@ CFG=flVC - Win32 Debug Unicode DLL
 !MESSAGE "flVC - Win32 Debug" (based on "Win32 (x86) Static Library")
 !MESSAGE "flVC - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "flVC - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "flVC - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "flVC - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "flVC - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "flVC - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -115,7 +111,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /machine:IX86
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw240d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "flVC - Win32 Release DLL"
@@ -138,7 +134,7 @@ LIB32=link.exe -lib
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /D "WXBUILD_FL_DLL" /YX /FD /c
 # SUBTRACT BASE CPP /u
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdll" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c
 # SUBTRACT CPP /u
 MTL=midl.exe
 RSC=rc.exe
@@ -148,133 +144,11 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw240d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldll.dll" /libpath:"../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw240.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldll.dll" /libpath:"../../../lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no /debug
 
-!ELSEIF  "$(CFG)" == "flVC - Win32 Release Unicode"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "flVC___Win32_Release_Unicode"
-# PROP BASE Intermediate_Dir "flVC___Win32_Release_Unicode"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_Unicode"
-# PROP Intermediate_Dir "Release_Unicode"
-# PROP Target_Dir ""
-LINK32=link.exe
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/msw" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswu" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__HACK_MY_MSDEV40__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "UNICODE" /D "_UNICODE" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fl.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\flu.lib"
-
-!ELSEIF  "$(CFG)" == "flVC - Win32 Release Unicode DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "flVC___Win32_Release_Unicode_DLL"
-# PROP BASE Intermediate_Dir "flVC___Win32_Release_Unicode_DLL"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Release_Unicode_DLL"
-# PROP Intermediate_Dir "Release_Unicode_DLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fld.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\fld.lib"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c
-# SUBTRACT BASE CPP /u
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdllu" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /D "_UNICODE" /D "UNICODE" /YX /FD /c
-# SUBTRACT CPP /u
-MTL=midl.exe
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldll.dll" /libpath:"../../../lib"
-# SUBTRACT BASE LINK32 /pdb:none /incremental:no /debug
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24u.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldllu.dll" /libpath:"../../../lib"
-# SUBTRACT LINK32 /pdb:none /incremental:no /debug
-
-!ELSEIF  "$(CFG)" == "flVC - Win32 Debug Unicode"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "flVC___Win32_Debug_Unicode"
-# PROP BASE Intermediate_Dir "flVC___Win32_Debug_Unicode"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_Unicode"
-# PROP Intermediate_Dir "Debug_Unicode"
-# PROP Target_Dir ""
-LINK32=link.exe
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswd" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswud" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "UNICODE" /D "_UNICODE" /YX /FD /c
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fld.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\flud.lib"
-
-!ELSEIF  "$(CFG)" == "flVC - Win32 Debug Unicode DLL"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "flVC___Win32_Debug_Unicode_DLL"
-# PROP BASE Intermediate_Dir "flVC___Win32_Debug_Unicode_DLL"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug_Unicode_DLL"
-# PROP Intermediate_Dir "Debug_Unicode_DLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\fld.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\fld.lib"
-CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /YX /FD /c
-# SUBTRACT BASE CPP /u
-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdllud" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_FL_DLL" /D "UNICODE" /D "_UNICODE" /YX /FD /c
-# SUBTRACT CPP /u
-MTL=midl.exe
-RSC=rc.exe
-# ADD BASE RSC /l 0x809
-# ADD RSC /l 0x809
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
-# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24ud.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldllud.dll" /libpath:"../../../lib"
-# SUBTRACT LINK32 /pdb:none
-
 !ENDIF 
 
 # Begin Target
@@ -283,10 +157,6 @@ LINK32=link.exe
 # Name "flVC - Win32 Debug"
 # Name "flVC - Win32 Debug DLL"
 # Name "flVC - Win32 Release DLL"
-# Name "flVC - Win32 Release Unicode"
-# Name "flVC - Win32 Release Unicode DLL"
-# Name "flVC - Win32 Debug Unicode"
-# Name "flVC - Win32 Debug Unicode DLL"
 # Begin Group "Headers"
 
 # PROP Default_Filter ""

contrib/src/fl/newbmpbtn.cpp

@@ -433,7 +433,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
         }
         else 
         {
-            wxFAIL_MSG(wxT("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()"));
+            wxFAIL_MSG("Unsupported FL alignment type detected in wxNewBitmapButton::RenderLabelImage()");
         }
     }
     else
@@ -731,7 +731,7 @@ void wxNewBitmapButton::Reshape( )
         // in the case of loading button from stream, check if we
         // have non-empty image-file name, load if possible 
 
-        if ( mImageFileName != wxT("") )
+        if ( mImageFileName != "" )
         {
             mDepressedBmp.LoadFile( mImageFileName, mImageFileType );
 
@@ -796,6 +796,6 @@ void wxNewBitmapButton::OnKillFocus( wxFocusEvent& event )
 {
     // useless
 
-    wxMessageBox(wxT("kill-focus for button!"));
+    wxMessageBox("kill-focus for button!");
 }
 

contrib/src/fl/rowlayoutpl.cpp

@@ -456,9 +456,6 @@ void cbRowLayoutPlugin::ApplyLengthRatios( cbRowInfo* pRow )
         }
     }  // for
 
-    if (pcntSum == 0.0)
-        pcntSum = 1.0;
-
     if ( haveSquished )
         unit = freeSpc / pcntSum;
 

contrib/src/fl/toolwnd.cpp

@@ -81,7 +81,7 @@ wxToolWindow::wxToolWindow()
 	  mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL ),
 #else
 	  // just to simulate MS-Dev style
-	  mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL, FALSE, wxT("MS Sans Serif") ),
+	  mTitleFont( 8, wxSWISS,  wxNORMAL, wxNORMAL, FALSE, "MS Sans Serif" ),
 #endif
 
       mTitleHeight  ( 16 ),
@@ -572,7 +572,7 @@ void wxToolWindow::OnMotion( wxMouseEvent& event )
 			DrawHintRect( mPrevHintRect );
 			DrawHintRect( finalRect );
 
-            ::wxLogTrace(wxT("%d,%d / %d,%d\n"), finalRect.x, finalRect.y, finalRect.width, finalRect.height);
+            ::wxLogTrace("%d,%d / %d,%d\n", finalRect.x, finalRect.y, finalRect.width, finalRect.height);
 		}
 
 		mPrevHintRect = finalRect;

contrib/src/gizmos/makefile.bcc

@@ -0,0 +1,20 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1998
+# Updated:
+#
+# Builds Gizmos library for BC++, 16-bit
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+LIBTARGET=$(WXDIR)\lib\gizmos.lib
+
+OBJECTS = multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
+
+!include $(WXDIR)\src\makelib.bcc
+

contrib/src/gizmos/makefile.wat

@@ -1,17 +1,29 @@
 # Gizmos makefile for Watcom C++
 
-WXDIR = ..\..\..
 EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
+WXDIR = ..\..\..
 
-LIBTARGET = $(WXDIR)\lib\gizmos_w.lib
+!include $(WXDIR)\src\makewat.env
 
-OBJECTS =  &
+GIZMOSLIB = $(WXDIR)\lib\gizmos_w.lib
-    $(OUTPUTDIR)\multicell.obj &
+THISDIR = $(WXDIR)\contrib\src\gizmos
-    $(OUTPUTDIR)\splittree.obj &
+OUTPUTDIR = $(THISDIR)\
-    $(OUTPUTDIR)\editlbox.obj &
-    $(OUTPUTDIR)\dynamicsash.obj &
-    $(OUTPUTDIR)\ledctrl.obj
 
-!include $(WXDIR)\src\makelib.wat
+NAME = gizmos
+LNK = $(name).lnk
 
+OBJECTS =  multicell.obj splittree.obj editlbox.obj dynamicsash.obj ledctrl.obj
+
+all: $(GIZMOSLIB) .SYMBOLIC
+
+$(GIZMOSLIB): $(OBJECTS)
+	*wlib /b /c /n /P=256 $(GIZMOSLIB) $(OBJECTS)
+
+clean:   .SYMBOLIC
+    -erase *.obj
+    -erase *.bak
+    -erase *.err 
+    -erase *.pch 
+    -erase $(GIZMOSLIB) 
+    -erase *.lbc
 

contrib/src/gizmos/splittree.cpp

@@ -113,10 +113,7 @@ void wxRemotelyScrolledTreeCtrl::SetScrollbars(int pixelsPerUnitX, int pixelsPer
     if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
     {
         wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
-//        win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, 0, noUnitsX, 0, xPos, 0, noRefresh);
+        win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, 0, noUnitsX, 0, xPos, 0, noRefresh);
-        // Don't refresh, or on wxGTK a portion of the window will be redrawn as if
-        // Y scrolling is at zero
-        win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, 0, xPos, 0, /* noRefresh */ TRUE);
 
         wxScrolledWindow* scrolledWindow = GetScrolledWindow();
         if (scrolledWindow)

contrib/src/mmedia/makefile.b32

@@ -9,7 +9,7 @@
 
 WXDIR = $(WXWIN)
 
-LIBTARGET=$(WXDIR)\lib\mmedia.lib
+LIBTARGET=$(WXDIR)\contrib\lib\mmedia.lib
 
 OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj \
   g723_40.obj g72x.obj sndaiff.obj sndbase.obj sndcodec.obj \

contrib/src/mmedia/makefile.wat

@@ -11,28 +11,33 @@
 WXDIR = ..\..\..
 EXTRACPPFLAGS = -I$(WXDIR)\contrib\include
 
+!include $(WXDIR)\src\makewat.env
+
+THISDIR = $(WXDIR)\contrib\src\mmedia
+OUTPUTDIR = $(THISDIR)\
+
+NAME = mmedia
+LNK = $(name).lnk
+
 LIBTARGET=$(WXDIR)\lib\mmedia_w.lib
 
-OBJECTS = &
+OBJECTS = cdbase.obj cdwin.obj g711.obj g721.obj g723_24.obj &
-    $(OUTPUTDIR)\cdbase.obj &
+  g723_40.obj g72x.obj sndaiff.obj sndbase.obj sndcodec.obj &
-    $(OUTPUTDIR)\cdwin.obj &
+  sndcpcm.obj sndfile.obj sndg72x.obj sndpcm.obj sndulaw.obj &
-    $(OUTPUTDIR)\g711.obj &
+  sndwav.obj sndwin.obj vidbase.obj vidwin.obj
-    $(OUTPUTDIR)\g721.obj &
+
-    $(OUTPUTDIR)\g723_24.obj &
+all:     $(LIBTARGET) .SYMBOLIC
-    $(OUTPUTDIR)\g723_40.obj &
+    
-    $(OUTPUTDIR)\g72x.obj &
+
-    $(OUTPUTDIR)\sndaiff.obj &
+$(LIBTARGET): $(OBJECTS)
-    $(OUTPUTDIR)\sndbase.obj &
+	*wlib /b /c /n /P=256 $(SVGLIB) $(OBJECTS)
-    $(OUTPUTDIR)\sndcodec.obj &
+
-    $(OUTPUTDIR)\sndcpcm.obj &
+clean:   .SYMBOLIC
-    $(OUTPUTDIR)\sndfile.obj &
+    -erase *.obj 
-    $(OUTPUTDIR)\sndg72x.obj &
+    -erase *.bak
-    $(OUTPUTDIR)\sndpcm.obj &
+    -erase *.err 
-    $(OUTPUTDIR)\sndulaw.obj &
+    -erase *.pch 
-    $(OUTPUTDIR)\sndwav.obj &
+    -erase $(LIBTARGET) 
-    $(OUTPUTDIR)\sndwin.obj &
+    -erase *.lbc
-    $(OUTPUTDIR)\vidbase.obj &
-    $(OUTPUTDIR)\vidwin.obj
 
-!include $(WXDIR)\src\makelib.wat
 

contrib/src/net/smapi.cpp

@@ -145,20 +145,12 @@ bool wxMapiSession::Logon(const wxString& sProfileName, const wxString& sPasswor
     
     LPSTR pszProfileName = NULL;
     LPSTR pszPassword = NULL;
-    wxCharBuffer cbProfile(1),cbPassword(1);
     if (nProfileLength)
     {
 //        pszProfileName = T2A((LPTSTR) (LPCTSTR) sProfileName);
 //        pszPassword = T2A((LPTSTR) (LPCTSTR) sPassword);
-#ifndef UNICODE
         pszProfileName = (LPSTR) sProfileName.c_str();
         pszPassword = (LPSTR) sPassword.c_str();
-#else
-        cbProfile = sProfileName.mb_str();
-        cbPassword = sPassword.mb_str();
-        pszProfileName = cbProfile.data();
-        pszPassword = cbPassword.data();
-#endif
     }
     
     //Setup the flags & UIParam parameters used in the MapiLogon call
@@ -260,13 +252,7 @@ bool wxMapiSession::Resolve(const wxString& sName, void* lppRecip1)
     
     //Call the MAPIResolveName function
 //    LPSTR lpszAsciiName = T2A((LPTSTR) (LPCTSTR) sName);
-#ifndef UNICODE
     LPSTR lpszAsciiName = (LPSTR) sName.c_str();
-#else
-    wxCharBuffer cbName(1);
-    cbName = sName.mb_str();
-    LPSTR lpszAsciiName = cbName.data();
-#endif
     ULONG nError = m_data->m_lpfnMAPIResolveName(m_data->m_hSession, 0, lpszAsciiName, 0, 0, lppRecip);
     if (nError != SUCCESS_SUCCESS)
     {
@@ -291,16 +277,8 @@ bool wxMapiSession::Send(wxMailMessage& message)
     //Create the MapiMessage structure to match the message parameter send into us
     MapiMessage mapiMessage;
     ZeroMemory(&mapiMessage, sizeof(mapiMessage));
-#ifndef UNICODE
     mapiMessage.lpszSubject = (LPSTR) message.m_subject.c_str();
     mapiMessage.lpszNoteText = (LPSTR) message.m_body.c_str();
-#else
-    wxCharBuffer cbSubject(1),cbBody(1),cbOriginator(1);
-    cbSubject = message.m_subject.mb_str();
-    cbBody = message.m_body.mb_str();
-    mapiMessage.lpszSubject = cbSubject.data();
-    mapiMessage.lpszNoteText = cbBody.data();
-#endif
 //    mapiMessage.lpszSubject = T2A((LPTSTR) (LPCTSTR) message.m_subject);
 //    mapiMessage.lpszNoteText = T2A((LPTSTR) (LPCTSTR) message.m_body);
     mapiMessage.nRecipCount = message.m_to.GetCount() + message.m_cc.GetCount() + message.m_bcc.GetCount();
@@ -317,12 +295,7 @@ bool wxMapiSession::Send(wxMailMessage& message)
 
         mapiMessage.lpOriginator->ulRecipClass = MAPI_ORIG;
         // TODO Do we have to call Resolve?
-#ifndef UNICODE
         mapiMessage.lpOriginator->lpszName = (LPSTR) message.m_from.c_str();
-#else
-        cbOriginator = message.m_from.mb_str();
-        mapiMessage.lpOriginator->lpszName = cbOriginator.data();
-#endif
     }
     
     //Setup the "To" recipients
@@ -341,17 +314,13 @@ bool wxMapiSession::Send(wxMailMessage& message)
         if (Resolve(sName, (void*) &lpTempRecip))
         {
             //Resolve worked, put the resolved name back into the sName
-            sName = wxString(lpTempRecip->lpszName,wxConvCurrent);
+            sName = lpTempRecip->lpszName;
             
             //Don't forget to free up the memory MAPI allocated for us
             m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
         }
         //recip.lpszName = T2A((LPTSTR) (LPCTSTR) sName);
-#ifndef UNICODE
         recip.lpszName = (LPSTR) sName.c_str();
-#else
-        recip.lpszName = sName.mb_str().release();
-#endif
         
         ++nRecipIndex;
     }
@@ -370,17 +339,13 @@ bool wxMapiSession::Send(wxMailMessage& message)
         if (Resolve(sName, (void*) &lpTempRecip))
         {
             //Resolve worked, put the resolved name back into the sName
-            sName = wxString(lpTempRecip->lpszName,wxConvCurrent);
+            sName = lpTempRecip->lpszName;
             
             //Don't forget to free up the memory MAPI allocated for us
             m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
         }
         //recip.lpszName = T2A((LPTSTR) (LPCTSTR) sName);
-#ifndef UNICODE
         recip.lpszName = (LPSTR) sName.c_str();
-#else
-        recip.lpszName = sName.mb_str().release();
-#endif
         
         ++nRecipIndex;
     }
@@ -399,17 +364,13 @@ bool wxMapiSession::Send(wxMailMessage& message)
         if (Resolve(sName, (void*) &lpTempRecip))
         {
             //Resolve worked, put the resolved name back into the sName
-            sName = wxString(lpTempRecip->lpszName,wxConvCurrent);
+            sName = lpTempRecip->lpszName;
             
             //Don't forget to free up the memory MAPI allocated for us
             m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
         }
         //recip.lpszName = T2A((LPTSTR) (LPCTSTR) sName);
-#ifndef UNICODE
         recip.lpszName = (LPSTR) sName.c_str();
-#else
-        recip.lpszName = sName.mb_str().release();
-#endif
         
         ++nRecipIndex;
     }
@@ -434,11 +395,7 @@ bool wxMapiSession::Send(wxMailMessage& message)
             wxString& sFilename = message.m_attachments[i];
             //file.lpszPathName = T2A((LPTSTR) (LPCTSTR) sFilename);
 
-#ifndef UNICODE
             file.lpszPathName = (LPSTR) sFilename.c_str();
-#else
-            file.lpszPathName = sFilename.mb_str().release();
-#endif
             //file.lpszFileName = file.lpszPathName;
             file.lpszFileName = NULL;
 
@@ -446,11 +403,7 @@ bool wxMapiSession::Send(wxMailMessage& message)
             {
                 wxString& sTitle = message.m_attachmentTitles[i];
                 //file.lpszFileName = T2A((LPTSTR) (LPCTSTR) sTitle);
-#ifndef UNICODE
                 file.lpszFileName = (LPSTR) sTitle.c_str();
-#else
-                file.lpszFileName = sTitle.mb_str().release();
-#endif
             }
         }
     }
@@ -470,24 +423,10 @@ bool wxMapiSession::Send(wxMailMessage& message)
     
     //Tidy up the Attachements
     if (nAttachmentSize)
-    {
-#ifdef UNICODE
-        for (int i = 0;i < nAttachmentSize;i++)
-        {
-            free(mapiMessage.lpFiles[i].lpszPathName);
-            free(mapiMessage.lpFiles[i].lpszFileName);
-        }
-#endif
         delete [] mapiMessage.lpFiles;
-    }
     
     //Free up the Recipients and Originator memory
-#ifdef UNICODE
-    for (int i = 0;i < nRecipIndex;i++)
-        free(mapiMessage.lpRecips[i].lpszName);
-#endif
     delete [] mapiMessage.lpRecips;
-
     delete mapiMessage.lpOriginator;
     
     return bSuccess;
@@ -497,3 +436,4 @@ long wxMapiSession::GetLastError() const
 {
     return m_data->m_nLastError;
 }
+

contrib/src/ogl/lines.cpp

@@ -2334,7 +2334,7 @@ wxRealPoint *wxLineShape::GetNextControlPoint(wxShape *nodeObject)
     return (wxRealPoint *)node->Data();
   }
   else
-    return NULL;
+    return FALSE;
 }
 
 /*

contrib/src/ogl/makefile.bcc

@@ -0,0 +1,21 @@
+#
+# File:		makefile.bcc
+# Author:	Julian Smart
+# Created:	1998
+# Updated:	
+#
+# Builds OGL library for BC++, 16-bit
+
+!if "$(WXWIN)" == ""
+!error You must define the WXWIN variable in autoexec.bat, e.g. WXWIN=c:\wx
+!endif
+
+WXDIR = $(WXWIN)
+
+LIBTARGET=$(WXDIR)\lib\ogl.lib
+
+OBJECTS = basic.obj basic2.obj canvas.obj ogldiag.obj lines.obj misc.obj divided.obj constrnt.obj\
+ composit.obj drawn.obj bmpshape.obj mfutils.obj
+
+!include $(WXDIR)\src\makelib.bcc
+

contrib/src/ogl/makefile.wat

@@ -1,24 +1,30 @@
-# OGL makefile
+# Objects makefile
 
 WXDIR = ..\..\..
 EXTRACPPFLAGS=-I$(WXDIR)\contrib\include;/DPROLOGIO
 
-LIBTARGET= $(WXDIR)\lib\ogl_w.lib
+!include $(WXDIR)\src\makewat.env
 
-OBJECTS =  &
+OGLLIB = $(WXDIR)\lib\ogl_w.lib
-    $(OUTPUTDIR)\basic.obj &
+THISDIR = $(WXDIR)\contrib\src\ogl
-    $(OUTPUTDIR)\basic2.obj &
+OUTPUTDIR = $(THISDIR)\
-    $(OUTPUTDIR)\canvas.obj &
-    $(OUTPUTDIR)\lines.obj &
-    $(OUTPUTDIR)\divided.obj &
-    $(OUTPUTDIR)\constrnt.obj &
-    $(OUTPUTDIR)\composit.obj &
-    $(OUTPUTDIR)\drawn.obj &
-    $(OUTPUTDIR)\bmpshape.obj &
-    $(OUTPUTDIR)\mfutils.obj &
-    $(OUTPUTDIR)\ogldiag.obj &
-    $(OUTPUTDIR)\oglmisc.obj
 
+NAME = ogl
+LNK = $(name).lnk
 
-!include $(WXDIR)\src\makelib.wat
+OBJECTS =  basic.obj basic2.obj canvas.obj lines.obj divided.obj constrnt.obj &
+    composit.obj drawn.obj bmpshape.obj mfutils.obj ogldiag.obj oglmisc.obj
+
+all: $(OGLLIB) .SYMBOLIC
+
+$(OGLLIB): $(OBJECTS)
+	*wlib /b /c /n /P=256 $(OGLLIB) $(OBJECTS)
+
+clean:   .SYMBOLIC
+    -erase *.obj 
+    -erase *.bak 
+    -erase *.err 
+    -erase *.pch 
+    -erase $(OGLLIB) 
+    -erase *.lbc
 

contrib/src/stc/Makefile.in

@@ -34,22 +34,18 @@ OBJECTS=PlatWX.o ScintillaWX.o stc.o \
         KeyMap.o		\
         KeyWords.o	        \
 	LexAVE.o		\
-	LexAda.o		\
-	LexAsm.o		\
 	LexBaan.o		\
 	LexBullant.o		\
 	LexMatlab.o		\
+	LexAda.o		\
 	LexCPP.o		\
 	LexConf.o		\
 	LexCrontab.o		\
-	LexCSS.o		\
 	LexEiffel.o		\
-	LexFortran.o		\
 	LexHTML.o		\
 	LexLisp.o		\
 	LexLua.o		\
 	LexOthers.o		\
-	LexPOV.o		\
 	LexPascal.o		\
 	LexPerl.o		\
 	LexPython.o		\
@@ -65,8 +61,6 @@ OBJECTS=PlatWX.o ScintillaWX.o stc.o \
 	UniConversion.o		\
         ViewStyle.o		\
 	WindowAccessor.o	\
-	XPM.o			\
-
 
 DEPFILES=$(OBJECTS:.o=.d)
 

contrib/src/stc/PlatWX.cpp

@@ -8,10 +8,7 @@
 
 #include <wx/wx.h>
 #include <wx/encconv.h>
-#include <wx/listctrl.h>
+
-#include <wx/mstream.h>
-#include <wx/image.h>
-#include <wx/imaglist.h>
 
 #include "Platform.h"
 #include "PlatWX.h"
@@ -216,44 +213,42 @@ public:
     SurfaceImpl();
     ~SurfaceImpl();
 
-    virtual void Init(WindowID wid);
+    void Init();
-    virtual void Init(SurfaceID sid, WindowID wid);
+    void Init(SurfaceID sid);
-    virtual void InitPixMap(int width, int height, Surface *surface_, WindowID wid);
+    void InitPixMap(int width, int height, Surface *surface_);
 
-    virtual void Release();
+    void Release();
-    virtual bool Initialised();
+    bool Initialised();
-    virtual void PenColour(ColourAllocated fore);
+    void PenColour(ColourAllocated fore);
-    virtual int LogPixelsY();
+    int LogPixelsY();
-    virtual int DeviceHeightFont(int points);
+    int DeviceHeightFont(int points);
-    virtual void MoveTo(int x_, int y_);
+    void MoveTo(int x_, int y_);
-    virtual void LineTo(int x_, int y_);
+    void LineTo(int x_, int y_);
-    virtual void Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back);
+    void Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back);
-    virtual void RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back);
+    void RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back);
-    virtual void FillRectangle(PRectangle rc, ColourAllocated back);
+    void FillRectangle(PRectangle rc, ColourAllocated back);
-    virtual void FillRectangle(PRectangle rc, Surface &surfacePattern);
+    void FillRectangle(PRectangle rc, Surface &surfacePattern);
-    virtual void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back);
+    void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back);
-    virtual void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back);
+    void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back);
-    virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource);
+    void Copy(PRectangle rc, Point from, Surface &surfaceSource);
 
-    virtual void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back);
+    void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back);
-    virtual void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back);
+    void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back);
-    virtual void DrawTextTransparent(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore);
+    void MeasureWidths(Font &font_, const char *s, int len, int *positions);
-    virtual void MeasureWidths(Font &font_, const char *s, int len, int *positions);
+    int WidthText(Font &font_, const char *s, int len);
-    virtual int WidthText(Font &font_, const char *s, int len);
+    int WidthChar(Font &font_, char ch);
-    virtual int WidthChar(Font &font_, char ch);
+    int Ascent(Font &font_);
-    virtual int Ascent(Font &font_);
+    int Descent(Font &font_);
-    virtual int Descent(Font &font_);
+    int InternalLeading(Font &font_);
-    virtual int InternalLeading(Font &font_);
+    int ExternalLeading(Font &font_);
-    virtual int ExternalLeading(Font &font_);
+    int Height(Font &font_);
-    virtual int Height(Font &font_);
+    int AverageCharWidth(Font &font_);
-    virtual int AverageCharWidth(Font &font_);
 
-    virtual int SetPalette(Palette *pal, bool inBackGround);
+    int SetPalette(Palette *pal, bool inBackGround);
-    virtual void SetClip(PRectangle rc);
+    void SetClip(PRectangle rc);
-    virtual void FlushCachedState();
+    void FlushCachedState();
 
-    virtual void SetUnicodeMode(bool unicodeMode_);
+    void SetUnicodeMode(bool unicodeMode_);
-    virtual void SetDBCSMode(int codePage);
 
     void BrushColour(ColourAllocated back);
     void SetFont(Font &font_);
@@ -270,35 +265,6 @@ SurfaceImpl::~SurfaceImpl() {
     Release();
 }
 
-void SurfaceImpl::Init(WindowID wid) {
-#if 0
-    Release();
-    hdc = new wxMemoryDC();
-    hdcOwned = true;
-#else
-    // On Mac and GTK the DC is not really valid until it has a bitmap
-    // selected into it.  So instead of just creating the DC with no bitmap,
-    // go ahead and give it one.
-    InitPixMap(1,1,NULL,wid);
-#endif
-}
-
-void SurfaceImpl::Init(SurfaceID hdc_, WindowID) {
-    Release();
-    hdc = (wxDC*)hdc_;
-}
-
-void SurfaceImpl::InitPixMap(int width, int height, Surface *surface_, WindowID) {
-    Release();
-    hdc = new wxMemoryDC();
-    hdcOwned = true;
-    if (width < 1) width = 1;
-    if (height < 1) height = 1;
-    bitmap = new wxBitmap(width, height);
-    ((wxMemoryDC*)hdc)->SelectObject(*bitmap);
-}
-
-
 void SurfaceImpl::Release() {
     if (bitmap) {
         ((wxMemoryDC*)hdc)->SelectObject(wxNullBitmap);
@@ -317,6 +283,33 @@ bool SurfaceImpl::Initialised() {
     return hdc != 0;
 }
 
+void SurfaceImpl::Init() {
+#if 0
+    Release();
+    hdc = new wxMemoryDC();
+    hdcOwned = true;
+#else
+    // On Mac and GTK the DC is not really valid until it has a bitmap
+    // selected into it.  So instead of just creating the DC with no bitmap,
+    // go ahead and give it one.
+    InitPixMap(1,1,NULL);
+#endif
+}
+
+void SurfaceImpl::Init(SurfaceID hdc_) {
+    Release();
+    hdc = (wxDC*)hdc_;
+}
+
+void SurfaceImpl::InitPixMap(int width, int height, Surface *surface_) {
+    Release();
+    hdc = new wxMemoryDC();
+    hdcOwned = true;
+    if (width < 1) width = 1;
+    if (height < 1) height = 1;
+    bitmap = new wxBitmap(width, height);
+    ((wxMemoryDC*)hdc)->SelectObject(*bitmap);
+}
 
 void SurfaceImpl::PenColour(ColourAllocated fore) {
     hdc->SetPen(wxPen(wxColourFromCA(fore), 1, wxSOLID));
@@ -405,7 +398,7 @@ void SurfaceImpl::DrawTextNoClip(PRectangle rc, Font &font, int ybase,
     SetFont(font);
     hdc->SetTextForeground(wxColourFromCA(fore));
     hdc->SetTextBackground(wxColourFromCA(back));
-    //FillRectangle(rc, back);
+    FillRectangle(rc, back);
 
     // ybase is where the baseline should be, but wxWin uses the upper left
     // corner, so I need to calculate the real position for the text...
@@ -418,27 +411,21 @@ void SurfaceImpl::DrawTextClipped(PRectangle rc, Font &font, int ybase,
     SetFont(font);
     hdc->SetTextForeground(wxColourFromCA(fore));
     hdc->SetTextBackground(wxColourFromCA(back));
-    //FillRectangle(rc, back);
+    FillRectangle(rc, back);
     hdc->SetClippingRegion(wxRectFromPRectangle(rc));
 
     // see comments above
     hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
+    hdc->DestroyClippingRegion();
 }
 
-
+int SurfaceImpl::WidthText(Font &font, const char *s, int len) {
-void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font, int ybase,
-                                      const char *s, int len,
-                                      ColourAllocated fore) {
-
     SetFont(font);
-    hdc->SetTextForeground(wxColourFromCA(fore));
+    int w;
-    hdc->SetBackgroundMode(wxTRANSPARENT);
+    int h;
 
-    // ybase is where the baseline should be, but wxWin uses the upper left
+    hdc->GetTextExtent(stc2wx(s, len), &w, &h);
-    // corner, so I need to calculate the real position for the text...
+    return w;
-    hdc->DrawText(stc2wx(s, len), rc.left, ybase - font.ascent);
-
-    hdc->SetBackgroundMode(wxSOLID);
 }
 
 
@@ -463,7 +450,7 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio
     // Instead of a running total, remeasure from the begining of the
     // text for each character's position.  This is because with AA fonts
     // on OS X widths can be fractions of pixels wide when more than one
-    // are drawn together, so the sum of all character widths is not necessarily
+    // are drawn together, so the sum of all character widths is not necessariy
     // (and probably not) the same as the whole string width.
     int* tpos = new int[len];
     size_t i;
@@ -504,16 +491,6 @@ void SurfaceImpl::MeasureWidths(Font &font, const char *s, int len, int *positio
 }
 
 
-int SurfaceImpl::WidthText(Font &font, const char *s, int len) {
-    SetFont(font);
-    int w;
-    int h;
-
-    hdc->GetTextExtent(stc2wx(s, len), &w, &h);
-    return w;
-}
-
-
 int SurfaceImpl::WidthChar(Font &font, char ch) {
     SetFont(font);
     int w;
@@ -575,13 +552,15 @@ void SurfaceImpl::FlushCachedState() {
 
 void SurfaceImpl::SetUnicodeMode(bool unicodeMode_) {
     unicodeMode=unicodeMode_;
+#if wxUSE_UNICODE
+    wxASSERT_MSG(unicodeMode == wxUSE_UNICODE,
+                 wxT("Only unicode may be used when wxUSE_UNICODE is on."));
+#else
+    wxASSERT_MSG(unicodeMode == wxUSE_UNICODE,
+                 wxT("Only non-unicode may be used when wxUSE_UNICODE is off."));
+#endif
 }
 
-void SurfaceImpl::SetDBCSMode(int codePage) {
-    // dbcsMode = codePage == SC_CP_DBCS;
-}
-
-
 Surface *Surface::Allocate() {
     return new SurfaceImpl;
 }
@@ -596,10 +575,8 @@ Window::~Window() {
 }
 
 void Window::Destroy() {
-    if (id) {
+    if (id)
-        Show(FALSE);
         GETWIN(id)->Destroy();
-    }
     id = 0;
 }
 
@@ -608,7 +585,6 @@ bool Window::HasFocus() {
 }
 
 PRectangle Window::GetPosition() {
-    if (! id) return PRectangle();
     wxRect rc(GETWIN(id)->GetPosition(), GETWIN(id)->GetSize());
     return PRectangleFromwxRect(rc);
 }
@@ -623,7 +599,6 @@ void Window::SetPositionRelative(PRectangle rc, Window) {
 }
 
 PRectangle Window::GetClientPosition() {
-    if (! id) return PRectangle();
     wxSize sz = GETWIN(id)->GetClientSize();
     return  PRectangle(0, 0, sz.x, sz.y);
 }
@@ -672,8 +647,6 @@ void Window::SetCursor(Cursor curs) {
     case cursorReverseArrow:
         cursorId = wxCURSOR_RIGHT_ARROW;
         break;
-    case cursorHand:
-        cursorId = wxCURSOR_HAND;
     default:
         cursorId = wxCURSOR_ARROW;
         break;
@@ -696,347 +669,199 @@ void Window::SetTitle(const char *s) {
 // Helper classes for ListBox
 
 
-// This is a simple subclass of wxLIstView that just resets focus to the
+#if 1 // defined(__WXMAC__)
-// parent when it gets it.
+class wxSTCListBoxWin : public wxListBox {
-class wxSTCListBox : public wxListView {
 public:
-    wxSTCListBox(wxWindow* parent, wxWindowID id,
+    wxSTCListBoxWin(wxWindow* parent, wxWindowID id)
-                 const wxPoint& pos, const wxSize& size,
+        : wxListBox(parent, id, wxDefaultPosition, wxSize(0,0),
-                 long style)
+                    0, NULL, wxLB_SINGLE | wxSIMPLE_BORDER) {
-        : wxListView(parent, id, pos, size, style)
+        SetCursor(wxCursor(wxCURSOR_ARROW));
-    {}
-
-    void OnFocus(wxFocusEvent& event) {
-        GetParent()->SetFocus();
-        event.Skip();
-    }
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxSTCListBox, wxListView)
-    EVT_SET_FOCUS( wxSTCListBox::OnFocus)
-END_EVENT_TABLE()
-
-
-
-
-// A window to place the wxSTCListBox upon
-class wxSTCListBoxWin : public wxWindow {
-private:
-    wxListView*         lv;
-    CallBackAction      doubleClickAction;
-    void*               doubleClickActionData;
-public:
-    wxSTCListBoxWin(wxWindow* parent, wxWindowID id) :
-        wxWindow(parent, id, wxDefaultPosition, wxSize(0,0), wxNO_BORDER )
-    {
-
-        SetBackgroundColour(*wxBLACK);
-        lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,
-                              wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxNO_BORDER);
-        lv->SetCursor(wxCursor(wxCURSOR_ARROW));
-        lv->InsertColumn(0, wxEmptyString);
-        lv->InsertColumn(1, wxEmptyString);
         Hide();
     }
 
-    int IconWidth() {
-        wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
-        if (il != NULL) {
-            int w, h;
-            il->GetSize(0, w, h);
-            return w;
-        }
-        return 0;
-    }
-
-
-    void SetDoubleClickAction(CallBackAction action, void *data) {
-        doubleClickAction = action;
-        doubleClickActionData = data;
-    }
-
-
     void OnFocus(wxFocusEvent& event) {
         GetParent()->SetFocus();
         event.Skip();
     }
 
-    void OnSize(wxSizeEvent& event) {
+    wxListBox* GetLB() { return this; }
-        // resize the child, leaving a 1 pixel border
-        wxSize sz = GetClientSize();
-        lv->SetSize(1, 1, sz.x-2, sz.y-2);
-        // reset the column widths
-        lv->SetColumnWidth(0, IconWidth()+4);
-        lv->SetColumnWidth(1, sz.x - 2 - lv->GetColumnWidth(0) -
-                           wxSystemSettings::GetMetric(wxSYS_VSCROLL_X));
-        event.Skip();
-    }
-
-    void OnActivate(wxListEvent& event) {
-        doubleClickAction(doubleClickActionData);
-    }
-
-    wxListView* GetLB() { return lv; }
 
 private:
     DECLARE_EVENT_TABLE()
 };
 
 
-BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxWindow)
+BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxListBox)
-    EVT_SET_FOCUS          (    wxSTCListBoxWin::OnFocus)
+    EVT_SET_FOCUS(wxSTCListBoxWin::OnFocus)
-    EVT_SIZE               (    wxSTCListBoxWin::OnSize)
-    EVT_LIST_ITEM_ACTIVATED(-1, wxSTCListBoxWin::OnActivate)
 END_EVENT_TABLE()
 
 
 
-inline wxSTCListBoxWin* GETLBW(WindowID win) {
+#else
-    return ((wxSTCListBoxWin*)win);
-}
 
-inline wxListView* GETLB(WindowID win) {
+
-    return GETLBW(win)->GetLB();
+class wxSTCListBox : public wxListBox {
+public:
+    wxSTCListBox(wxWindow* parent, wxWindowID id)
+        : wxListBox(parent, id, wxDefaultPosition, wxDefaultSize,
+                    0, NULL, wxLB_SINGLE | wxSIMPLE_BORDER | wxWANTS_CHARS)
+        {}
+
+    void OnKeyDown(wxKeyEvent& event) {
+        // Give the key events to the STC.  It will then update
+        // the listbox as needed.
+        GetGrandParent()->GetEventHandler()->ProcessEvent(event);
+    }
+
+private:
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxSTCListBox, wxListBox)
+    EVT_KEY_DOWN(wxSTCListBox::OnKeyDown)
+    EVT_CHAR(wxSTCListBox::OnKeyDown)
+END_EVENT_TABLE()
+
+
+
+#undef  wxSTC_USE_POPUP
+#define wxSTC_USE_POPUP 0  // wxPopupWindow just doesn't work well in this case...
+
+// A window to place the listbox upon.  If wxPopupWindow is supported then
+// that will be used so the listbox can extend beyond the client area of the
+// wxSTC if needed.
+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+#include <wx/popupwin.h>
+#define wxSTCListBoxWinBase wxPopupWindow
+#define param2  wxBORDER_NONE  // popup's 2nd param is flags
+#else
+#define wxSTCListBoxWinBase wxWindow
+#define param2 -1 // wxWindow's 2nd param is ID
+#endif
+
+class wxSTCListBoxWin : public wxSTCListBoxWinBase {
+public:
+    wxSTCListBoxWin(wxWindow* parent, wxWindowID id)
+        : wxSTCListBoxWinBase(parent, param2) {
+        lb = new wxSTCListBox(this, id);
+        lb->SetCursor(wxCursor(wxCURSOR_ARROW));
+        lb->SetFocus();
+   }
+
+    void OnSize(wxSizeEvent& event) {
+        lb->SetSize(GetSize());
+    }
+
+    wxListBox* GetLB() { return lb; }
+
+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO) {
+        if (x != -1)
+            GetParent()->ClientToScreen(&x, NULL);
+        if (y != -1)
+            GetParent()->ClientToScreen(NULL, &y);
+        wxSTCListBoxWinBase::DoSetSize(x, y, width, height, sizeFlags);
+    }
+#endif
+
+private:
+    wxSTCListBox* lb;
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxSTCListBoxWin, wxSTCListBoxWinBase)
+    EVT_SIZE(wxSTCListBoxWin::OnSize)
+END_EVENT_TABLE()
+#endif
+
+inline wxListBox* GETLB(WindowID win) {
+    return (((wxSTCListBoxWin*)win)->GetLB());
 }
 
 //----------------------------------------------------------------------
 
-class ListBoxImpl : public ListBox {
-private:
-    int                 lineHeight;
-    bool                unicodeMode;
-    int                 desiredVisibleRows;
-    int                 aveCharWidth;
-    int                 maxStrWidth;
-    wxImageList*        imgList;
-    wxArrayInt*         imgTypeMap;
-
-public:
-    ListBoxImpl();
-    ~ListBoxImpl();
-
-    virtual void SetFont(Font &font);
-    virtual void Create(Window &parent, int ctrlID, int lineHeight_, bool unicodeMode_);
-    virtual void SetAverageCharWidth(int width);
-    virtual void SetVisibleRows(int rows);
-    virtual PRectangle GetDesiredRect();
-    virtual int CaretFromEdge();
-    virtual void Clear();
-    virtual void Append(char *s, int type = -1);
-    virtual int Length();
-    virtual void Select(int n);
-    virtual int GetSelection();
-    virtual int Find(const char *prefix);
-    virtual void GetValue(int n, char *value, int len);
-    virtual void Sort();
-    virtual void RegisterImage(int type, const char *xpm_data);
-    virtual void ClearRegisteredImages();
-    virtual void SetDoubleClickAction(CallBackAction, void *);
-
-};
-
-
-ListBoxImpl::ListBoxImpl()
-    : lineHeight(10), unicodeMode(false),
-      desiredVisibleRows(5), aveCharWidth(8), maxStrWidth(0),
-      imgList(NULL), imgTypeMap(NULL)
-{
-}
-
-ListBoxImpl::~ListBoxImpl() {
-    if (imgList) {
-        delete imgList;
-        imgList = NULL;
-    }
-    if (imgTypeMap) {
-        delete imgTypeMap;
-        imgTypeMap = NULL;
-    }
-}
-
-
-void ListBoxImpl::SetFont(Font &font) {
-    GETLB(id)->SetFont(*((wxFont*)font.GetID()));
-}
-
-
-void ListBoxImpl::Create(Window &parent, int ctrlID, int lineHeight_, bool unicodeMode_) {
-    lineHeight =  lineHeight_;
-    unicodeMode = unicodeMode_;
-    maxStrWidth = 0;
-    id = new wxSTCListBoxWin(GETWIN(parent.GetID()), ctrlID);
-    if (imgList != NULL)
-        GETLB(id)->SetImageList(imgList, wxIMAGE_LIST_SMALL);
-}
-
-
-void ListBoxImpl::SetAverageCharWidth(int width) {
-    aveCharWidth = width;
-}
-
-
-void ListBoxImpl::SetVisibleRows(int rows) {
-    desiredVisibleRows = rows;
-}
-
-
-PRectangle ListBoxImpl::GetDesiredRect() {
-    // wxListCtrl doesn't have a DoGetBestSize, so instead we kept track of
-    // the max size in Append and calculate it here...
-    int maxw = maxStrWidth;
-    int maxh = 0;
-
-    // give it a default if there are no lines, and/or add a bit more
-    if (maxw == 0) maxw = 100;
-    maxw += aveCharWidth * 3 +
-            GETLBW(id)->IconWidth() + wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
-    if (maxw > 350)
-        maxw = 350;
-
-    // estimate a desired height
-    int count = GETLB(id)->GetItemCount();
-    if (count) {
-        wxRect rect;
-        GETLB(id)->GetItemRect(0, rect);
-        maxh = count * rect.GetHeight();
-        if (maxh > 140)  // TODO:  Use desiredVisibleRows??
-            maxh = 140;
-
-        // Try to make the size an exact multiple of some number of lines
-        int lines = maxh / rect.GetHeight();
-        maxh = (lines + 1) * rect.GetHeight() + 2;
-    }
-    else
-        maxh = 100;
-
-    PRectangle rc;
-    rc.top = 0;
-    rc.left = 0;
-    rc.right = maxw;
-    rc.bottom = maxh;
-    return rc;
-}
-
-
-int ListBoxImpl::CaretFromEdge() {
-    return 4 + GETLBW(id)->IconWidth();
-}
-
-
-void ListBoxImpl::Clear() {
-    GETLB(id)->DeleteAllItems();
-}
-
-
-void ListBoxImpl::Append(char *s, int type) {
-    wxString text = stc2wx(s);
-    long count  = GETLB(id)->GetItemCount();
-    long itemID  = GETLB(id)->InsertItem(count, wxEmptyString);
-    GETLB(id)->SetItem(itemID, 1, text);
-    int itemWidth = 0;
-    GETLB(id)->GetTextExtent(text, &itemWidth, NULL);
-    maxStrWidth = wxMax(maxStrWidth, itemWidth);
-    if (type != -1) {
-        wxCHECK_RET(imgTypeMap, wxT("Unexpected NULL imgTypeMap"));
-        long idx = imgTypeMap->Item(type);
-        GETLB(id)->SetItemImage(itemID, idx, idx);
-    }
-}
-
-
-int ListBoxImpl::Length() {
-    return GETLB(id)->GetItemCount();
-}
-
-
-void ListBoxImpl::Select(int n) {
-    bool select = TRUE;
-    if (n == -1) {
-        n = 0;
-        select = FALSE;
-    }
-    GETLB(id)->Focus(n);
-    GETLB(id)->Select(n, select);
-}
-
-
-int ListBoxImpl::GetSelection() {
-    return GETLB(id)->GetFirstSelected();
-}
-
-
-int ListBoxImpl::Find(const char *prefix) {
-    // No longer used
-    return -1;
-}
-
-
-void ListBoxImpl::GetValue(int n, char *value, int len) {
-    wxListItem item;
-    item.SetId(n);
-    item.SetColumn(1);
-    item.SetMask(wxLIST_MASK_TEXT);
-    GETLB(id)->GetItem(item);
-    strncpy(value, wx2stc(item.GetText()), len);
-    value[len-1] = '\0';
-}
-
-void ListBoxImpl::Sort() {
-}
-
-
-void ListBoxImpl::RegisterImage(int type, const char *xpm_data) {
-    wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1);
-    wxBitmap bmp(wxImage(stream, wxBITMAP_TYPE_XPM));
-
-    if (! imgList) {
-        // assumes all images are the same size
-        imgList = new wxImageList(bmp.GetWidth(), bmp.GetHeight(), TRUE);
-        imgTypeMap = new wxArrayInt;
-    }
-
-    int idx = imgList->Add(bmp);
-
-    // do we need to extend the mapping array?
-    wxArrayInt& itm = *imgTypeMap;
-    if ( itm.GetCount() < type+1)
-        itm.Add(-1, type - itm.GetCount() + 1);
-
-    // Add an item that maps type to the image index
-    itm[type] = idx;
-}
-
-void ListBoxImpl::ClearRegisteredImages() {
-    if (imgList) {
-        delete imgList;
-        imgList = NULL;
-    }
-    if (imgTypeMap) {
-        delete imgTypeMap;
-        imgTypeMap = NULL;
-    }
-    if (id)
-        GETLB(id)->SetImageList(NULL, wxIMAGE_LIST_SMALL);
-}
-
-
-void ListBoxImpl::SetDoubleClickAction(CallBackAction action, void *data) {
-    GETLBW(id)->SetDoubleClickAction(action, data);
-}
-
-
-
 ListBox::ListBox() {
 }
 
 ListBox::~ListBox() {
 }
 
-ListBox *ListBox::Allocate() {
+void ListBox::Create(Window &parent, int ctrlID) {
-    return new ListBoxImpl();
+    id = new wxSTCListBoxWin(GETWIN(parent.GetID()), ctrlID);
+}
+
+void ListBox::SetVisibleRows(int rows) {
+    desiredVisibleRows = rows;
+}
+
+PRectangle ListBox::GetDesiredRect() {
+    wxSize sz = GETLB(id)->GetBestSize();
+    PRectangle rc;
+    rc.top = 0;
+    rc.left = 0;
+    if (sz.x > 400)
+        sz.x = 400;
+    if (sz.y > 140)  // TODO:  Use desiredVisibleRows??
+        sz.y = 140;
+    rc.right = sz.x;
+    rc.bottom = sz.y;
+    return rc;
+}
+
+void ListBox::SetAverageCharWidth(int width) {
+    aveCharWidth = width;
+}
+
+void ListBox::SetFont(Font &font) {
+    GETLB(id)->SetFont(*((wxFont*)font.GetID()));
+}
+
+void ListBox::Clear() {
+    GETLB(id)->Clear();
+}
+
+void ListBox::Append(char *s) {
+    GETLB(id)->Append(stc2wx(s));
+}
+
+int ListBox::Length() {
+    return GETLB(id)->GetCount();
+}
+
+void ListBox::Select(int n) {
+    bool select = TRUE;
+    if (n == -1) {
+        n = 0;
+        select = FALSE;
+    }
+    GETLB(id)->SetSelection(n, select);
+#ifdef __WXGTK__
+    if (n > 4)
+        n = n - 4;
+    else
+        n = 0;
+    GETLB(id)->SetFirstItem(n);
+#endif
+}
+
+int ListBox::GetSelection() {
+    return GETLB(id)->GetSelection();
+}
+
+int ListBox::Find(const char *prefix) {
+    // No longer used
+    return -1;
+}
+
+void ListBox::GetValue(int n, char *value, int len) {
+    wxString text = GETLB(id)->GetString(n);
+    strncpy(value, wx2stc(text), len);
+    value[len-1] = '\0';
+}
+
+void ListBox::Sort() {
 }
 
 //----------------------------------------------------------------------
@@ -1081,16 +906,13 @@ const char *Platform::DefaultFont() {
 }
 
 int Platform::DefaultFontSize() {
-    return wxNORMAL_FONT->GetPointSize();
+    return 8;
 }
 
 unsigned int Platform::DoubleClickTime() {
     return 500;   // **** ::GetDoubleClickTime();
 }
 
-bool Platform::MouseButtonBounce() {
-	return FALSE;
-}
 void Platform::DebugDisplay(const char *s) {
     wxLogDebug(stc2wx(s));
 }
@@ -1192,13 +1014,6 @@ bool Platform::IsDBCSLeadByte(int codePage, char ch) {
     return false;
 }
 
-int Platform::DBCSCharLength(int codePage, const char *s) {
-    return 0;
-}
-
-int Platform::DBCSCharMaxLength() {
-    return 0;
-}
 
 
 //----------------------------------------------------------------------

contrib/src/stc/ScintillaWX.cpp

@@ -67,28 +67,26 @@ void  wxSTCDropTarget::OnLeave() {
 #define param2  wxBORDER_NONE  // popup's 2nd param is flags
 #else
 #define wxSTCCallTipBase wxWindow
-#define param2 -1 // wxWindow's 2nd param is ID
+#define param2 -1 // wxWindows 2nd param is ID
 #endif
 
 class wxSTCCallTip : public wxSTCCallTipBase {
 public:
-    wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx)
+    wxSTCCallTip(wxWindow* parent, CallTip* ct)
-        : wxSTCCallTipBase(parent, param2),
+        : wxSTCCallTipBase(parent, param2)
-          m_ct(ct), m_swx(swx)
         {
+            m_ct = ct;
         }
 
     ~wxSTCCallTip() {
+        if (HasCapture()) ReleaseMouse();
     }
 
-    bool AcceptsFocus() const { return FALSE; }
-
     void OnPaint(wxPaintEvent& evt) {
         wxPaintDC dc(this);
         Surface* surfaceWindow = Surface::Allocate();
-        surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
+        surfaceWindow->Init(&dc);
         m_ct->PaintCT(surfaceWindow);
-        surfaceWindow->Release();
         delete surfaceWindow;
     }
 
@@ -97,13 +95,6 @@ public:
         event.Skip();
     }
 
-    void OnLeftDown(wxMouseEvent& event) {
-        wxPoint pt = event.GetPosition();
-        Point p(pt.x, pt.y);
-        m_ct->MouseClick(p);
-        m_swx->CallTipClick();
-    }
-
 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
     virtual void DoSetSize(int x, int y,
                            int width, int height,
@@ -114,18 +105,32 @@ public:
             GetParent()->ClientToScreen(NULL, &y);
         wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
     }
+
+    virtual bool Show( bool show = TRUE ) {
+        bool retval = wxSTCCallTipBase::Show(show);
+        if (show)
+            CaptureMouse();
+        else
+            if (HasCapture()) ReleaseMouse();
+        return retval;
+    }
+
+    void OnLeftDown(wxMouseEvent& ) {
+        Show(FALSE);
+    }
 #endif
 
 private:
-    CallTip*      m_ct;
+    CallTip*    m_ct;
-    ScintillaWX*  m_swx;
     DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(wxSTCCallTip, wxSTCCallTipBase)
     EVT_PAINT(wxSTCCallTip::OnPaint)
     EVT_SET_FOCUS(wxSTCCallTip::OnFocus)
+#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
     EVT_LEFT_DOWN(wxSTCCallTip::OnLeftDown)
+#endif
 END_EVENT_TABLE()
 
 
@@ -253,23 +258,18 @@ void ScintillaWX::SetHorizontalScrollPos() {
     }
 }
 
-
 const int H_SCROLL_STEP = 20;
 
 bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
     bool modified = false;
 
-    int vertEnd = nMax;
-    if (!verticalScrollBarVisible)
-        vertEnd = 0;
-
     // Check the vertical scrollbar
     if (stc->m_vScrollBar == NULL) {  // Use built-in scrollbar
         int  sbMax    = stc->GetScrollRange(wxVERTICAL);
         int  sbThumb  = stc->GetScrollThumb(wxVERTICAL);
         int  sbPos    = stc->GetScrollPos(wxVERTICAL);
-        if (sbMax != vertEnd || sbThumb != nPage) {
+        if (sbMax != nMax || sbThumb != nPage) {
-            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, vertEnd+1);
+            stc->SetScrollbar(wxVERTICAL, sbPos, nPage, nMax+1);
             modified = true;
         }
     }
@@ -277,8 +277,8 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int  sbMax    = stc->m_vScrollBar->GetRange();
         int  sbPage   = stc->m_vScrollBar->GetPageSize();
         int  sbPos    = stc->m_vScrollBar->GetThumbPosition();
-        if (sbMax != vertEnd || sbPage != nPage) {
+        if (sbMax != nMax || sbPage != nPage) {
-            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, vertEnd+1, nPage);
+            stc->m_vScrollBar->SetScrollbar(sbPos, nPage, nMax+1, nPage);
             modified = true;
         }
     }
@@ -298,7 +298,7 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int sbThumb  = stc->GetScrollThumb(wxHORIZONTAL);
         int sbPos    = stc->GetScrollPos(wxHORIZONTAL);
         if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
-            stc->SetScrollbar(wxHORIZONTAL, sbPos, pageWidth, horizEnd);
+            stc->SetScrollbar(wxHORIZONTAL, 0, pageWidth, horizEnd);
             modified = true;
             if (scrollWidth < pageWidth) {
                 HorizontalScrollTo(0);
@@ -310,7 +310,7 @@ bool ScintillaWX::ModifyScrollBars(int nMax, int nPage) {
         int sbThumb  = stc->m_hScrollBar->GetPageSize();
         int sbPos    = stc->m_hScrollBar->GetThumbPosition();
         if ((sbMax != horizEnd) || (sbThumb != pageWidth) || (sbPos != 0)) {
-            stc->m_hScrollBar->SetScrollbar(sbPos, pageWidth, horizEnd, pageWidth);
+            stc->m_hScrollBar->SetScrollbar(0, pageWidth, horizEnd, pageWidth);
             modified = true;
             if (scrollWidth < pageWidth) {
                 HorizontalScrollTo(0);
@@ -376,25 +376,21 @@ bool ScintillaWX::CanPaste() {
     bool canPaste = FALSE;
     bool didOpen;
 
-    if (Editor::CanPaste()) {
+    if ( (didOpen = !wxTheClipboard->IsOpened()) )
-        if ( (didOpen = !wxTheClipboard->IsOpened()) )
+        wxTheClipboard->Open();
-            wxTheClipboard->Open();
 
-        if (wxTheClipboard->IsOpened()) {
+    if (wxTheClipboard->IsOpened()) {
-            wxTheClipboard->UsePrimarySelection(FALSE);
+        wxTheClipboard->UsePrimarySelection(FALSE);
-            canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
+        canPaste = wxTheClipboard->IsSupported(wxUSE_UNICODE ? wxDF_UNICODETEXT : wxDF_TEXT);
-            if (didOpen)
+        if (didOpen)
-                wxTheClipboard->Close();
+            wxTheClipboard->Close();
-        }
     }
     return canPaste;
 }
 
 void ScintillaWX::CreateCallTipWindow(PRectangle) {
-    if (! ct.wCallTip.Created() ) {
+    ct.wCallTip = new wxSTCCallTip(stc, &ct);
-        ct.wCallTip = new wxSTCCallTip(stc, &ct, this);
+    ct.wDraw = ct.wCallTip;
-        ct.wDraw = ct.wCallTip;
-    }
 }
 
 
@@ -442,38 +438,52 @@ long ScintillaWX::WndProc(unsigned int iMessage, unsigned long wParam, long lPar
       switch (iMessage) {
       case SCI_CALLTIPSHOW: {
           // NOTE: This is copied here from scintilla/src/ScintillaBase.cxx
-          // because of the little tweak that needs done below for wxGTK.
+          // because of the little tweak that needs done below.  When updating
-          // When updating new versions double check that this is still
+          // new versions double check that this is still needed, and that any
-          // needed, and that any new code there is copied here too.
+          // new code there is copied here too.
-          Point pt = LocationFromPosition(wParam);
-          char* defn = reinterpret_cast<char *>(lParam);
           AutoCompleteCancel();
-          pt.y += vs.lineHeight;
+          if (!ct.wCallTip.Created()) {
-          PRectangle rc = ct.CallTipStart(currentPos, pt,
+              Point pt = LocationFromPosition(wParam);
-                                          defn,
+              pt.y += vs.lineHeight;
-                                          vs.styles[STYLE_DEFAULT].fontName,
+              PRectangle rc = ct.CallTipStart(currentPos, pt,
-                                          vs.styles[STYLE_DEFAULT].sizeZoomed,
+                                              reinterpret_cast<char *>(lParam),
-                                          IsUnicodeMode(),
+                                              vs.styles[STYLE_DEFAULT].fontName,
-                                          wMain);
+                                              vs.styles[STYLE_DEFAULT].sizeZoomed,
-          // If the call-tip window would be out of the client
+                                              IsUnicodeMode());
-          // space, adjust so it displays above the text.
+              // If the call-tip window would be out of the client
-          PRectangle rcClient = GetClientRectangle();
+              // space, adjust so it displays above the text.
-          if (rc.bottom > rcClient.bottom) {
+              PRectangle rcClient = GetClientRectangle();
+              if (rc.bottom > rcClient.bottom) {
 #ifdef __WXGTK__
-              int offset = int(vs.lineHeight * 1.25)  + rc.Height();
+                  int offset = int(vs.lineHeight * 1.25)  + rc.Height();
 #else
-              int offset = vs.lineHeight + rc.Height();
+                  int offset = vs.lineHeight + rc.Height();
 #endif
-              rc.top -= offset;
+                  rc.top -= offset;
-              rc.bottom -= offset;
+                  rc.bottom -= offset;
+              }
+              // Now display the window.
+              CreateCallTipWindow(rc);
+              ct.wCallTip.SetPositionRelative(rc, wMain);
+              ct.wCallTip.Show();
           }
-          // Now display the window.
-          CreateCallTipWindow(rc);
-          ct.wCallTip.SetPositionRelative(rc, wMain);
-          ct.wCallTip.Show();
           break;
       }
 
+      case SCI_SETCARETWIDTH:
+          // NOTE: Allows a caet width of zero.  This one has been added to
+          // Scintilla CVS so it can be removed from here when we update to
+          // version 1.50.
+          if (wParam <= 0)
+              vs.caretWidth = 0;
+          else if (wParam >= 3)
+              vs.caretWidth = 3;
+          else
+              vs.caretWidth = wParam;
+          InvalidateStyleRedraw();
+          break;
+
+
       default:
           return ScintillaBase::WndProc(iMessage, wParam, lParam);
       }
@@ -489,22 +499,22 @@ void ScintillaWX::DoPaint(wxDC* dc, wxRect rect) {
 
     paintState = painting;
     Surface* surfaceWindow = Surface::Allocate();
-    surfaceWindow->Init(dc, wMain.GetID());
+    surfaceWindow->Init(dc);
-    rcPaint = PRectangleFromwxRect(rect);
+    PRectangle rcPaint = PRectangleFromwxRect(rect);
-    PRectangle rcClient = GetClientRectangle();
-    paintingAllText = rcPaint.Contains(rcClient);
-
     dc->BeginDrawing();
-    ClipChildren(*dc, rcPaint);
     Paint(surfaceWindow, rcPaint);
     dc->EndDrawing();
-
     delete surfaceWindow;
     if (paintState == paintAbandoned) {
         // Painting area was insufficient to cover new styling or brace highlight positions
         FullPaint();
     }
     paintState = notPainting;
+#ifdef __WXGTK__
+    // On wxGTK the editor window paints can overwrite the listbox...
+    if (ac.Active())
+        ((wxWindow*)ac.lb.GetID())->Refresh(TRUE);
+#endif
 }
 
 
@@ -781,18 +791,16 @@ void ScintillaWX::DoDragLeave() {
 // Redraw all of text area. This paint will not be abandoned.
 void ScintillaWX::FullPaint() {
     paintState = painting;
-    rcPaint = GetClientRectangle();
+    rcPaint = GetTextRectangle();
     paintingAllText = true;
     wxClientDC dc(stc);
     Surface* surfaceWindow = Surface::Allocate();
-    surfaceWindow->Init(&dc, wMain.GetID());
+    surfaceWindow->Init(&dc);
-
-    dc.BeginDrawing();
-    ClipChildren(dc, rcPaint);
     Paint(surfaceWindow, rcPaint);
-    dc.EndDrawing();
-
     delete surfaceWindow;
+
+//     stc->Refresh(FALSE);
+
     paintState = notPainting;
 }
 
@@ -806,21 +814,6 @@ void ScintillaWX::DoScrollToColumn(int column) {
     HorizontalScrollTo(column * vs.spaceWidth);
 }
 
-void ScintillaWX::ClipChildren(wxDC& dc, PRectangle rect) {
-#ifdef __WXGTK__
-    wxRegion rgn(wxRectFromPRectangle(rect));
-    if (ac.Active()) {
-        wxRect childRect = ((wxWindow*)ac.lb->GetID())->GetRect();
-        rgn.Subtract(childRect);
-    }
-    if (ct.inCallTipMode) {
-        wxRect childRect = ((wxWindow*)ct.wCallTip.GetID())->GetRect();
-        rgn.Subtract(childRect);
-    }
-
-    dc.SetClippingRegion(rgn);
-#endif
-}
 
 
 //----------------------------------------------------------------------

contrib/src/stc/ScintillaWX.h

@@ -27,7 +27,6 @@
 #include "Platform.h"
 
 #include "Scintilla.h"
-#include "XPM.h"
 #ifdef SCI_LEXER
 #include "SciLexer.h"
 #include "PropSet.h"
@@ -150,7 +149,6 @@ public:
     bool GetHideSelection() { return hideSelection; }
     void DoScrollToLine(int line);
     void DoScrollToColumn(int column);
-    void ClipChildren(wxDC& dc, PRectangle rect);
 
 private:
     bool                capturedMouse;
@@ -161,9 +159,6 @@ private:
     wxDragResult        dragResult;
 #endif
     int                 wheelRotation;
-
-
-    friend class wxSTCCallTip;
 };
 
 //----------------------------------------------------------------------

contrib/src/stc/StcVC.dsp

@@ -111,7 +111,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /machine:IX86
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "stcVC - Win32 Release DLL"
@@ -129,10 +129,10 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stc.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\lib\stcd.lib"
-# ADD LIB32 /nologo /out:"..\..\..\lib\stc.lib"
+# ADD LIB32 /nologo /out:"..\..\..\lib\stcd.lib"
 CPP=cl.exe
-# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdll" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /D "WXBUILD_STC_DLL" /YX /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../include" /I "../../include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /D "WXBUILD_STC_DLL" /YX /FD /c
 # SUBTRACT BASE CPP /u
 # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Ob2 /I "../../../include" /I "../../include" /I "../../../lib/mswdll" /I "./scintilla/include/" /I "./scintilla/src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXMAKING_STC_DLL" /D "SCI_LEXER" /D "LINK_LEXERS" /D "__WX__" /YX /FD /c
 # SUBTRACT CPP /u
@@ -144,9 +144,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/stcdlld.dll" /libpath:"../../../lib"
 # SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw24.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/stcdll.dll" /libpath:"../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw250.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/stcdll.dll" /libpath:"../../../lib"
 # SUBTRACT LINK32 /pdb:none /incremental:no /debug
 
 !ENDIF
@@ -282,10 +282,6 @@ SOURCE=.\scintilla\src\LexAda.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\scintilla\src\LexAsm.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=.\scintilla\src\LexAVE.cxx
 # End Source File
 # Begin Source File
@@ -310,18 +306,10 @@ SOURCE=.\scintilla\src\LexCrontab.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\scintilla\src\LexCSS.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=.\scintilla\src\LexEiffel.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\scintilla\src\LexFortran.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=.\scintilla\src\LexHTML.cxx
 # End Source File
 # Begin Source File
@@ -342,10 +330,6 @@ SOURCE=.\scintilla\src\LexOthers.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\scintilla\src\LexPOV.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=.\scintilla\src\LexPascal.cxx
 # End Source File
 # Begin Source File
@@ -462,10 +446,6 @@ SOURCE=.\scintilla\src\WindowAccessor.cxx
 # End Source File
 # Begin Source File
 
-SOURCE=.\scintilla\src\XPM.cxx
-# End Source File
-# Begin Source File
-
 SOURCE=.\scintilla\include\WindowAccessor.h
 # End Source File
 # End Group

contrib/src/stc/gen_iface.py

@@ -42,9 +42,6 @@ cmdValues = [ (2300, 2349),
               (2176, 2180),
               (2390, 2393),
               (2395, 2396),
-              2404,
-              (2413, 2416),
-              (2450, 2454),
             ]
 
 
@@ -91,114 +88,90 @@ methodOverrideMap = {
     'GetViewWS' : ( 'GetViewWhiteSpace', 0, 0, 0),
     'SetViewWS' : ( 'SetViewWhiteSpace', 0, 0, 0),
 
-    'GetCharAt' :
+    'GetCharAt' : ( 0, 0,
-    ( 0, 0,
+                    '''int %s(int pos) {
-      '''int %s(int pos) {
+                       return (unsigned char)SendMsg(%s, pos, 0);''',
-         return (unsigned char)SendMsg(%s, pos, 0);''',
+                    0),
-      0),
 
-    'GetStyleAt' :
+    'GetStyleAt' : ( 0, 0,
-    ( 0, 0,
+                    '''int %s(int pos) {
-      '''int %s(int pos) {
+                       return (unsigned char)SendMsg(%s, pos, 0);''',
-         return (unsigned char)SendMsg(%s, pos, 0);''',
+                    0),
-      0),
 
-    'GetStyledText' :
+    'GetStyledText' : (0,
-    (0,
+                       'wxMemoryBuffer %s(int startPos, int endPos);',
-     'wxMemoryBuffer %s(int startPos, int endPos);',
 
-     '''wxMemoryBuffer %s(int startPos, int endPos) {
+                       '''wxMemoryBuffer %s(int startPos, int endPos) {
-        wxMemoryBuffer buf;
+                          wxMemoryBuffer buf;
-        if (endPos < startPos) {
+                          if (endPos < startPos) {
-            int temp = startPos;
+                              int temp = startPos;
-            startPos = endPos;
+                              startPos = endPos;
-            endPos = temp;
+                              endPos = temp;
-        }
+                          }
-        int len = endPos - startPos;
+                          int len = endPos - startPos;
-        if (!len) return buf;
+                          if (!len) return buf;
-        TextRange tr;
+                          TextRange tr;
-        tr.lpstrText = (char*)buf.GetWriteBuf(len*2+1);
+                          tr.lpstrText = (char*)buf.GetWriteBuf(len*2+1);
-        tr.chrg.cpMin = startPos;
+                          tr.chrg.cpMin = startPos;
-        tr.chrg.cpMax = endPos;
+                          tr.chrg.cpMax = endPos;
-        len = SendMsg(%s, 0, (long)&tr);
+                          len = SendMsg(%s, 0, (long)&tr);
-        buf.UngetWriteBuf(len);
+                          buf.UngetWriteBuf(len);
-        return buf;''',
+                          return buf;''',
 
-     ('Retrieve a buffer of cells.',)),
+                       ('Retrieve a buffer of cells.',)),
 
 
-    'PositionFromPoint' :
+    'PositionFromPoint' : (0,
-    (0,
+                           'int %s(wxPoint pt);',
-     'int %s(wxPoint pt);',
 
-     '''int %s(wxPoint pt) {
+                           '''int %s(wxPoint pt) {
-        return SendMsg(%s, pt.x, pt.y);''',
+                              return SendMsg(%s, pt.x, pt.y);''',
-     0),
 
-    'GetCurLine' :
+                           0),
-    (0,
-     '#ifdef SWIG\n    wxString %s(int* OUTPUT);\n#else\n    wxString GetCurLine(int* linePos=NULL);\n#endif',
 
-        '''wxString %s(int* linePos) {
+    'GetCurLine' : (0,
-        int len = LineLength(GetCurrentLine());
+                    '#ifdef SWIG\n    wxString %s(int* OUTPUT);\n#else\n    wxString GetCurLine(int* linePos=NULL);\n#endif',
-        if (!len) {
-            if (linePos)  *linePos = 0;
-            return wxEmptyString;
-        }
 
-        wxMemoryBuffer mbuf(len+1);
+                    '''wxString %s(int* linePos) {
-        char* buf = (char*)mbuf.GetWriteBuf(len+1);
+                       int len = LineLength(GetCurrentLine());
+                       if (!len) {
+                           if (linePos)  *linePos = 0;
+                           return wxEmptyString;
+                       }
 
-        int pos = SendMsg(%s, len+1, (long)buf);
+                       wxMemoryBuffer mbuf(len+1);
-        mbuf.UngetWriteBuf(len);
+                       char* buf = (char*)mbuf.GetWriteBuf(len+1);
-        mbuf.AppendByte(0);
-        if (linePos)  *linePos = pos;
-        return stc2wx(buf);''',
 
-     0),
+                       int pos = SendMsg(%s, len+1, (long)buf);
+                       mbuf.UngetWriteBuf(len);
+                       mbuf.AppendByte(0);
+                       if (linePos)  *linePos = pos;
+                       return stc2wx(buf);''',
+
+                    0),
 
     'SetUsePalette' : (None, 0,0,0),
 
     'MarkerSetFore' : ('MarkerSetForeground', 0, 0, 0),
     'MarkerSetBack' : ('MarkerSetBackground', 0, 0, 0),
 
-    'MarkerDefine' :
+    'MarkerDefine' : (0,
-    (0,
+                      '''void %s(int markerNumber, int markerSymbol,
-     '''void %s(int markerNumber, int markerSymbol,
+                         const wxColour& foreground = wxNullColour,
-                const wxColour& foreground = wxNullColour,
+                         const wxColour& background = wxNullColour);''',
-                const wxColour& background = wxNullColour);''',
 
-     '''void %s(int markerNumber, int markerSymbol,
+                      '''void %s(int markerNumber, int markerSymbol,
-                const wxColour& foreground,
+                            const wxColour& foreground,
-                const wxColour& background) {
+                            const wxColour& background) {
 
-                SendMsg(%s, markerNumber, markerSymbol);
+                            SendMsg(%s, markerNumber, markerSymbol);
-                if (foreground.Ok())
+                            if (foreground.Ok())
-                    MarkerSetForeground(markerNumber, foreground);
+                                MarkerSetForeground(markerNumber, foreground);
-                if (background.Ok())
+                            if (background.Ok())
-                    MarkerSetBackground(markerNumber, background);''',
+                                MarkerSetBackground(markerNumber, background);''',
-
-     ('Set the symbol used for a particular marker number,',
-      'and optionally the fore and background colours.')),
-
-
-    'MarkerDefinePixmap' :
-    ('MarkerDefineBitmap',
-     '''void %s(int markerNumber, const wxBitmap& bmp);''',
-     '''void %s(int markerNumber, const wxBitmap& bmp) {
-        // convert bmp to a xpm in a string
-        wxMemoryOutputStream strm;
-        wxImage img = bmp.ConvertToImage();
-        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
-        size_t len = strm.GetSize();
-        char* buff = new char[len+1];
-        strm.CopyTo(buff, len);
-        buff[len] = 0;
-        SendMsg(%s, markerNumber, (long)buff);
-        delete [] buff;
-        ''',
-     ('Define a marker from a bitmap',)),
 
+                      ('Set the symbol used for a particular marker number,',
+                       'and optionally the fore and background colours.')),
 
     'SetMarginTypeN' : ('SetMarginType', 0, 0, 0),
     'GetMarginTypeN' : ('GetMarginType', 0, 0, 0),
@@ -216,33 +189,32 @@ methodOverrideMap = {
     'SetCaretFore' : ('SetCaretForeground', 0, 0, 0),
     'StyleSetFont' : ('StyleSetFaceName', 0, 0, 0),
 
-    'AssignCmdKey' :
+    'AssignCmdKey' : ('CmdKeyAssign',
-    ('CmdKeyAssign',
+                      'void %s(int key, int modifiers, int cmd);',
-     'void %s(int key, int modifiers, int cmd);',
 
-     '''void %s(int key, int modifiers, int cmd) {
+                      '''void %s(int key, int modifiers, int cmd) {
-         SendMsg(%s, MAKELONG(key, modifiers), cmd);''',
+                          SendMsg(%s, MAKELONG(key, modifiers), cmd);''',
-     0),
 
+                      0),
 
-    'ClearCmdKey' :
+    'ClearCmdKey' : ('CmdKeyClear',
-    ('CmdKeyClear',
+                      'void %s(int key, int modifiers);',
-     'void %s(int key, int modifiers);',
 
-     '''void %s(int key, int modifiers) {
+                      '''void %s(int key, int modifiers) {
-         SendMsg(%s, MAKELONG(key, modifiers));''',
+                          SendMsg(%s, MAKELONG(key, modifiers));''',
-     0),
+
+                      0),
 
     'ClearAllCmdKeys' : ('CmdKeyClearAll', 0, 0, 0),
 
 
-    'SetStylingEx' :
+    'SetStylingEx' : ('SetStyleBytes',
-    ('SetStyleBytes',
+                      'void %s(int length, char* styleBytes);',
-     'void %s(int length, char* styleBytes);',
 
-     '''void %s(int length, char* styleBytes) {
+                      '''void %s(int length, char* styleBytes) {
-        SendMsg(%s, length, (long)styleBytes);''',
+                          SendMsg(%s, length, (long)styleBytes);''',
-     0),
+
+                      0),
 
 
     'IndicSetStyle' : ('IndicatorSetStyle', 0, 0, 0),
@@ -273,162 +245,129 @@ methodOverrideMap = {
     'AutoCGetAutoHide' : ('AutoCompGetAutoHide', 0, 0, 0),
     'AutoCSetDropRestOfWord' : ('AutoCompSetDropRestOfWord', 0,0,0),
     'AutoCGetDropRestOfWord' : ('AutoCompGetDropRestOfWord', 0,0,0),
-    'AutoCGetTypeSeparator' : ('AutoCompGetTypeSeparator', 0, 0, 0),
-    'AutoCSetTypeSeparator' : ('AutoCompSetTypeSeparator', 0, 0, 0),
-
-    'RegisterImage' :
-    (0,
-     '''void %s(int type, const wxBitmap& bmp);''',
-     '''void %s(int type, const wxBitmap& bmp) {
-        // convert bmp to a xpm in a string
-        wxMemoryOutputStream strm;
-        wxImage img = bmp.ConvertToImage();
-        img.SaveFile(strm, wxBITMAP_TYPE_XPM);
-        size_t len = strm.GetSize();
-        char* buff = new char[len+1];
-        strm.CopyTo(buff, len);
-        buff[len] = 0;
-        SendMsg(%s, type, (long)buff);
-        delete [] buff;
-     ''',
-     ('Register an image for use in autocompletion lists.',)),
-
-
-    'ClearRegisteredImages' : (0, 0, 0,
-                               ('Clear all the registered images.',)),
 
 
     'SetHScrollBar' : ('SetUseHorizontalScrollBar', 0, 0, 0),
     'GetHScrollBar' : ('GetUseHorizontalScrollBar', 0, 0, 0),
 
-    'SetVScrollBar' : ('SetUseVerticalScrollBar', 0, 0, 0),
-    'GetVScrollBar' : ('GetUseVerticalScrollBar', 0, 0, 0),
-
     'GetCaretFore' : ('GetCaretForeground', 0, 0, 0),
 
     'GetUsePalette' : (None, 0, 0, 0),
 
-    'FindText' :
+    'FindText' : (0,
-    (0,
+                  '''int %s(int minPos, int maxPos, const wxString& text, int flags=0);''',
-     '''int %s(int minPos, int maxPos, const wxString& text, int flags=0);''',
 
-     '''int %s(int minPos, int maxPos,
+                  '''int %s(int minPos, int maxPos,
-               const wxString& text,
+                            const wxString& text,
-               int flags) {
+                            int flags) {
-            TextToFind  ft;
+                     TextToFind  ft;
-            ft.chrg.cpMin = minPos;
+                     ft.chrg.cpMin = minPos;
-            ft.chrg.cpMax = maxPos;
+                     ft.chrg.cpMax = maxPos;
-            wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+                     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-            ft.lpstrText = (char*)(const char*)buf;
+                     ft.lpstrText = (char*)(const char*)buf;
 
-            return SendMsg(%s, flags, (long)&ft);''',
+                     return SendMsg(%s, flags, (long)&ft);''',
-     0),
+                  0),
 
-    'FormatRange' :
+    'FormatRange' : (0,
-    (0,
+                     '''int %s(bool   doDraw,
-     '''int %s(bool   doDraw,
+                               int    startPos,
-               int    startPos,
+                               int    endPos,
-               int    endPos,
+                               wxDC*  draw,
-               wxDC*  draw,
+                               wxDC*  target,  // Why does it use two? Can they be the same?
-               wxDC*  target,  // Why does it use two? Can they be the same?
+                               wxRect renderRect,
-               wxRect renderRect,
+                               wxRect pageRect);''',
-               wxRect pageRect);''',
+                     ''' int %s(bool   doDraw,
-     ''' int %s(bool   doDraw,
+                                int    startPos,
-                int    startPos,
+                                int    endPos,
-                int    endPos,
+                                wxDC*  draw,
-                wxDC*  draw,
+                                wxDC*  target,  // Why does it use two? Can they be the same?
-                wxDC*  target,  // Why does it use two? Can they be the same?
+                                wxRect renderRect,
-                wxRect renderRect,
+                                wxRect pageRect) {
-                wxRect pageRect) {
+                            RangeToFormat fr;
-             RangeToFormat fr;
 
-             if (endPos < startPos) {
+                            if (endPos < startPos) {
-                 int temp = startPos;
+                                int temp = startPos;
-                 startPos = endPos;
+                                startPos = endPos;
-                 endPos = temp;
+                                endPos = temp;
-             }
+                            }
-             fr.hdc = draw;
+                            fr.hdc = draw;
-             fr.hdcTarget = target;
+                            fr.hdcTarget = target;
-             fr.rc.top = renderRect.GetTop();
+                            fr.rc.top = renderRect.GetTop();
-             fr.rc.left = renderRect.GetLeft();
+                            fr.rc.left = renderRect.GetLeft();
-             fr.rc.right = renderRect.GetRight();
+                            fr.rc.right = renderRect.GetRight();
-             fr.rc.bottom = renderRect.GetBottom();
+                            fr.rc.bottom = renderRect.GetBottom();
-             fr.rcPage.top = pageRect.GetTop();
+                            fr.rcPage.top = pageRect.GetTop();
-             fr.rcPage.left = pageRect.GetLeft();
+                            fr.rcPage.left = pageRect.GetLeft();
-             fr.rcPage.right = pageRect.GetRight();
+                            fr.rcPage.right = pageRect.GetRight();
-             fr.rcPage.bottom = pageRect.GetBottom();
+                            fr.rcPage.bottom = pageRect.GetBottom();
-             fr.chrg.cpMin = startPos;
+                            fr.chrg.cpMin = startPos;
-             fr.chrg.cpMax = endPos;
+                            fr.chrg.cpMax = endPos;
 
-             return SendMsg(%s, doDraw, (long)&fr);''',
+                            return SendMsg(%s, doDraw, (long)&fr);''',
-     0),
+                     0),
 
 
-    'GetLine' :
+    'GetLine' : (0,
-    (0,
+                    'wxString %s(int line);',
-     'wxString %s(int line);',
 
-     '''wxString %s(int line) {
+                    '''wxString %s(int line) {
-         int len = LineLength(line);
+                       int len = LineLength(line);
-         if (!len) return wxEmptyString;
+                       if (!len) return wxEmptyString;
 
-         wxMemoryBuffer mbuf(len+1);
+                       wxMemoryBuffer mbuf(len+1);
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+                       char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(%s, line, (long)buf);
+                       SendMsg(%s, line, (long)buf);
-         mbuf.UngetWriteBuf(len);
+                       mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
+                       mbuf.AppendByte(0);
-         return stc2wx(buf);''',
+                       return stc2wx(buf);''',
 
-     ('Retrieve the contents of a line.',)),
+                    ('Retrieve the contents of a line.',)),
 
     'SetSel' : ('SetSelection', 0, 0, 0),
+    'GetSelText' : ('GetSelectedText',
+                    'wxString %s();',
 
-    'GetSelText' :
+                    '''wxString %s() {
-    ('GetSelectedText',
+                            int   start;
-     'wxString %s();',
+                            int   end;
 
-     '''wxString %s() {
+                            GetSelection(&start, &end);
-         int   start;
+                            int   len  = end - start;
-         int   end;
+                            if (!len) return wxEmptyString;
 
-         GetSelection(&start, &end);
+                            wxMemoryBuffer mbuf(len+1);
-         int   len  = end - start;
+                            char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         if (!len) return wxEmptyString;
+                            SendMsg(%s, 0, (long)buf);
+                            mbuf.UngetWriteBuf(len);
+                            mbuf.AppendByte(0);
+                            return stc2wx(buf);''',
 
-         wxMemoryBuffer mbuf(len+1);
+                    ('Retrieve the selected text.',)),
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(%s, 0, (long)buf);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);''',
 
-     ('Retrieve the selected text.',)),
+    'GetTextRange' : (0,
+                      'wxString %s(int startPos, int endPos);',
 
+                      '''wxString %s(int startPos, int endPos) {
+                            if (endPos < startPos) {
+                                int temp = startPos;
+                                startPos = endPos;
+                                endPos = temp;
+                            }
+                            int   len  = endPos - startPos;
+                            if (!len) return wxEmptyString;
+                            wxMemoryBuffer mbuf(len+1);
+                            char* buf = (char*)mbuf.GetWriteBuf(len);
+                            TextRange tr;
+                            tr.lpstrText = buf;
+                            tr.chrg.cpMin = startPos;
+                            tr.chrg.cpMax = endPos;
+                            SendMsg(%s, 0, (long)&tr);
+                            mbuf.UngetWriteBuf(len);
+                            mbuf.AppendByte(0);
+                            return stc2wx(buf);''',
 
-    'GetTextRange' :
+                       ('Retrieve a range of text.',)),
-    (0,
-     'wxString %s(int startPos, int endPos);',
-
-     '''wxString %s(int startPos, int endPos) {
-         if (endPos < startPos) {
-             int temp = startPos;
-             startPos = endPos;
-             endPos = temp;
-         }
-         int   len  = endPos - startPos;
-         if (!len) return wxEmptyString;
-         wxMemoryBuffer mbuf(len+1);
-         char* buf = (char*)mbuf.GetWriteBuf(len);
-         TextRange tr;
-         tr.lpstrText = buf;
-         tr.chrg.cpMin = startPos;
-         tr.chrg.cpMax = endPos;
-         SendMsg(%s, 0, (long)&tr);
-         mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
-         return stc2wx(buf);''',
-
-     ('Retrieve a range of text.',)),
 
     'PointXFromPosition' : (None, 0, 0, 0),
     'PointYFromPosition' : (None, 0, 0, 0),
@@ -437,104 +376,88 @@ methodOverrideMap = {
     'ReplaceSel' : ('ReplaceSelection', 0, 0, 0),
     'Null' : (None, 0, 0, 0),
 
-    'GetText' :
+    'GetText' : (0,
-    (0,
+                 'wxString %s();',
-     'wxString %s();',
 
-     '''wxString %s() {
+                 '''wxString %s() {
-         int len  = GetTextLength();
+                        int len  = GetTextLength();
-         wxMemoryBuffer mbuf(len+1);   // leave room for the null...
+                        wxMemoryBuffer mbuf(len+1);   // leave room for the null...
-         char* buf = (char*)mbuf.GetWriteBuf(len+1);
+                        char* buf = (char*)mbuf.GetWriteBuf(len+1);
-         SendMsg(%s, len+1, (long)buf);
+                        SendMsg(%s, len+1, (long)buf);
-         mbuf.UngetWriteBuf(len);
+                        mbuf.UngetWriteBuf(len);
-         mbuf.AppendByte(0);
+                        mbuf.AppendByte(0);
-         return stc2wx(buf);''',
+                        return stc2wx(buf);''',
 
-     ('Retrieve all the text in the document.', )),
+                 ('Retrieve all the text in the document.', )),
 
     'GetDirectFunction' : (None, 0, 0, 0),
     'GetDirectPointer' : (None, 0, 0, 0),
 
-    'CallTipPosStart'   : ('CallTipPosAtStart', 0, 0, 0),
+    'CallTipPosStart' : ('CallTipPosAtStart', 0, 0, 0),
-    'CallTipSetHlt'     : ('CallTipSetHighlight', 0, 0, 0),
+    'CallTipSetHlt' : ('CallTipSetHighlight', 0, 0, 0),
-    'CallTipSetBack'    : ('CallTipSetBackground', 0, 0, 0),
+    'CallTipSetBack' : ('CallTipSetBackground', 0, 0, 0),
-    'CallTipSetFore'    : ('CallTipSetForeground', 0, 0, 0),
-    'CallTipSetForeHlt' : ('CallTipSetForegroundHighlight', 0, 0, 0),
-
-    'SetHotspotActiveFore' : ('SetHotspotActiveForeground', 0, 0, 0),
-    'SetHotspotActiveBack' : ('SetHotspotActiveBackground', 0, 0, 0),
 
 
-    'ReplaceTarget' :
+    'ReplaceTarget' : (0,
-    (0,
+                       'int %s(const wxString& text);',
-     'int %s(const wxString& text);',
 
-     '''
+                       '''
-     int %s(const wxString& text) {
+                       int %s(const wxString& text) {
-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+                           wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+                           return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
-     0),
+                       0),
 
-    'ReplaceTargetRE' :
+    'ReplaceTargetRE' : (0,
-    (0,
+                       'int %s(const wxString& text);',
-     'int %s(const wxString& text);',
 
-     '''
+                       '''
-     int %s(const wxString& text) {
+                       int %s(const wxString& text) {
-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+                           wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+                           return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
-     0),
+                       0),
 
-    'SearchInTarget' :
+    'SearchInTarget' : (0,
-    (0,
+                       'int %s(const wxString& text);',
-     'int %s(const wxString& text);',
 
-     '''
+                       '''
-     int %s(const wxString& text) {
+                       int %s(const wxString& text) {
-         wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
+                           wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(text);
-         return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
+                           return SendMsg(%s, strlen(buf), (long)(const char*)buf);''',
-     0),
+                       0),
 
 
-    'GetDocPointer' :
+    'GetDocPointer' : (0,
-    (0,
+                       'void* %s();',
-     'void* %s();',
+                       '''void* %s() {
-     '''void* %s() {
+                           return (void*)SendMsg(%s);''',
-         return (void*)SendMsg(%s);''',
+                       0),
-     0),
 
-    'SetDocPointer' :
+    'SetDocPointer' : (0,
-    (0,
+                       'void %s(void* docPointer);',
-     'void %s(void* docPointer);',
+                       '''void %s(void* docPointer) {
-     '''void %s(void* docPointer) {
+                           SendMsg(%s, 0, (long)docPointer);''',
-         SendMsg(%s, 0, (long)docPointer);''',
+                       0),
-     0),
 
-    'CreateDocument' :
+    'CreateDocument' : (0,
-    (0,
+                       'void* %s();',
-     'void* %s();',
+                       '''void* %s() {
-     '''void* %s() {
+                           return (void*)SendMsg(%s);''',
-         return (void*)SendMsg(%s);''',
+                        0),
-     0),
 
-    'AddRefDocument' :
+    'AddRefDocument' : (0,
-    (0,
+                       'void %s(void* docPointer);',
-     'void %s(void* docPointer);',
+                       '''void %s(void* docPointer) {
-     '''void %s(void* docPointer) {
+                           SendMsg(%s, 0, (long)docPointer);''',
-         SendMsg(%s, 0, (long)docPointer);''',
+                        0),
-     0),
 
-    'ReleaseDocument' :
+    'ReleaseDocument' : (0,
-    (0,
+                       'void %s(void* docPointer);',
-     'void %s(void* docPointer);',
+                       '''void %s(void* docPointer) {
-     '''void %s(void* docPointer) {
+                           SendMsg(%s, 0, (long)docPointer);''',
-         SendMsg(%s, 0, (long)docPointer);''',
+                         0),
-     0),
+    'SetCodePage' : (0,
-
+                     0,
-    'SetCodePage' :
+                     '''void %s(int codePage) {
-    (0,
-     0,
-     '''void %s(int codePage) {
 #if wxUSE_UNICODE
     wxASSERT_MSG(codePage == wxSTC_CP_UTF8,
                  wxT("Only wxSTC_CP_UTF8 may be used when wxUSE_UNICODE is on."));
@@ -542,8 +465,8 @@ methodOverrideMap = {
     wxASSERT_MSG(codePage != wxSTC_CP_UTF8,
                  wxT("wxSTC_CP_UTF8 may not be used when wxUSE_UNICODE is off."));
 #endif
-    SendMsg(%s, codePage);''',
+                 SendMsg(%s, codePage);''',
-     ("Set the code page used to interpret the bytes of the document as characters.",) ),
+                         ("Set the code page used to interpret the bytes of the document as characters.",) ),
 
 
     'GrabFocus' : (None, 0, 0, 0),
@@ -551,9 +474,6 @@ methodOverrideMap = {
     'GetFocus'  : ('GetSTCFocus', 0, 0, 0),
 
 
-    'LoadLexerLibrary' : (None, 0,0,0),
-
-
 
     # Remove all methods that are key commands since they can be
     # executed with CmdKeyExecute
@@ -602,16 +522,7 @@ methodOverrideMap = {
     'LineScrollDown' : (None, 0, 0, 0),
     'LineScrollUp' : (None, 0, 0, 0),
     'DeleteBackNotLine' : (None, 0, 0, 0),
-    'HomeWrap' : (None, 0, 0, 0),
+
-    'HomeWrapExtend' : (None, 0, 0, 0),
-    'LineEndWrap' : (None, 0, 0, 0),
-    'LineEndWrapExtend' : (None, 0, 0, 0),
-    'VCHomeWrap' : (None, 0, 0, 0),
-    'VCHomeWrapExtend' : (None, 0, 0, 0),
-    'ParaDown' : (None, 0, 0, 0),
-    'ParaDownExtend' : (None, 0, 0, 0),
-    'ParaUp' : (None, 0, 0, 0),
-    'ParaUpExtend' : (None, 0, 0, 0),
 
 
 

contrib/src/stc/makefile.b32

@@ -19,7 +19,7 @@ S=$(SCINTILLA)\src
 
 STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)/include -I$(S)
 
-LIBTARGET=$(WXDIR)\lib\stc.lib
+LIBTARGET=$(WXDIR)\contrib\lib\stc.lib
 
 OBJECTS = \
         AutoComplete.obj	\
@@ -34,21 +34,17 @@ OBJECTS = \
         KeyWords.obj	        \
 	LexAVE.obj		\
 	LexAda.obj		\
-	LexAsm.obj		\
 	LexBaan.obj		\
 	LexBullant.obj		\
 	LexMatlab.obj		\
 	LexCPP.obj		\
 	LexConf.obj		\
 	LexCrontab.obj		\
-	LexCSS.obj		\
 	LexEiffel.obj		\
-	LexFortran.obj		\
 	LexHTML.obj		\
 	LexLisp.obj		\
 	LexLua.obj		\
 	LexOthers.obj		\
-	LexPOV.obj		\
 	LexPascal.obj		\
 	LexPerl.obj		\
 	LexPython.obj		\
@@ -64,19 +60,17 @@ OBJECTS = \
 	UniConversion.obj	\
         ViewStyle.obj		\
 	WindowAccessor.obj	\
-	XPM.obj  		\
                             	\
 	PlatWX.obj              \
 	ScintillaWX.obj         \
 	stc.obj                 \
 
-
 STCCFG = stc.cfg
 STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
 
 default: $(STCCFG) $(LIBTARGET)
 
-cleancfg:
+cleancfg: 
 	del $(STCCFG)
 
 {$(S)}.cxx.obj:

contrib/src/stc/makefile.g95

@@ -22,21 +22,17 @@ OBJECTS = \
         $(S)/KeyWords.$(OBJSUFF)	\
 	$(S)/LexAVE.$(OBJSUFF)		\
 	$(S)/LexAda.$(OBJSUFF)		\
-	$(S)/LexAsm.$(OBJSUFF)		\
 	$(S)/LexBaan.$(OBJSUFF)		\
 	$(S)/LexBullant.$(OBJSUFF)	\
 	$(S)/LexMatlab.$(OBJSUFF)	\
 	$(S)/LexCPP.$(OBJSUFF)		\
 	$(S)/LexConf.$(OBJSUFF)		\
 	$(S)/LexCrontab.$(OBJSUFF)	\
-	$(S)/LexCSS.$(OBJSUFF)		\
 	$(S)/LexEiffel.$(OBJSUFF)	\
-	$(S)/LexFortran.$(OBJSUFF)	\
 	$(S)/LexHTML.$(OBJSUFF)		\
 	$(S)/LexLisp.$(OBJSUFF)		\
 	$(S)/LexLua.$(OBJSUFF)		\
 	$(S)/LexOthers.$(OBJSUFF)	\
-	$(S)/LexPOV.$(OBJSUFF)		\
 	$(S)/LexPascal.$(OBJSUFF)	\
 	$(S)/LexPerl.$(OBJSUFF)		\
 	$(S)/LexPython.$(OBJSUFF)	\
@@ -52,13 +48,11 @@ OBJECTS = \
 	$(S)/UniConversion.$(OBJSUFF)	\
         $(S)/ViewStyle.$(OBJSUFF)	\
 	$(S)/WindowAccessor.$(OBJSUFF)	\
-	$(S)/XPM.$(OBJSUFF)		\
 	\
 	PlatWX.$(OBJSUFF) \
 	ScintillaWX.$(OBJSUFF) \
 	stc.$(OBJSUFF)
 
-
 LIBTARGET = $(WXDIR)/lib/libstc.a
 
 include $(WXDIR)/src/makelib.g95

contrib/src/stc/makefile.vc

@@ -27,21 +27,17 @@ OBJECTS = \
         $(D)\KeyWords.obj	        \
 	$(D)\LexAVE.obj			\
 	$(D)\LexAda.obj			\
-	$(D)\LexAsm.obj			\
 	$(D)\LexBaan.obj		\
 	$(D)\LexBullant.obj		\
 	$(D)\LexMatlab.obj		\
 	$(D)\LexCPP.obj			\
 	$(D)\LexConf.obj		\
 	$(D)\LexCrontab.obj		\
-	$(D)\LexCSS.obj			\
 	$(D)\LexEiffel.obj		\
-	$(D)\LexFortran.obj		\
 	$(D)\LexHTML.obj		\
 	$(D)\LexLisp.obj		\
 	$(D)\LexLua.obj			\
 	$(D)\LexOthers.obj		\
-	$(D)\LexPOV.obj			\
 	$(D)\LexPascal.obj		\
 	$(D)\LexPerl.obj		\
 	$(D)\LexPython.obj		\
@@ -57,7 +53,6 @@ OBJECTS = \
 	$(D)\UniConversion.obj		\
         $(D)\ViewStyle.obj		\
 	$(D)\WindowAccessor.obj		\
-	$(D)\XPM.obj			\
 				\
 	$(D)\PlatWX.obj		\
 	$(D)\ScintillaWX.obj	\

contrib/src/stc/makefile.wat

@@ -1,88 +0,0 @@
-# STC makefile for Watcom C++
-
-WXDIR = ..\..\..
-
-SCINTILLA=$(WXDIR)\contrib\src\stc\scintilla
-S=$(SCINTILLA)\src
-STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -DLINK_LEXERS -I$(SCINTILLA)\include -I$(S)
-
-EXTRACPPFLAGS = -I$(WXDIR)\contrib\include $(STCEXTRACPPFLAGS)
-
-!include $(WXDIR)\src\makewat.env
-
-STCLIB = $(WXDIR)\lib\stc_w.lib
-THISDIR = $(WXDIR)\contrib\src\stc
-OUTPUTDIR = $(THISDIR)\
-
-
-NAME = stc
-LNK = $(name).lnk
-
-OBJECTS = &
-    AutoComplete.obj	    &
-    CallTip.obj	            &
-    CellBuffer.obj	    	&
-    ContractionState.obj  	&
-    Document.obj	        &
-	DocumentAccessor.obj	&
-    Editor.obj		        &
-    Indicator.obj	        &
-    KeyMap.obj		        &
-    KeyWords.obj	        &
-	LexAVE.obj		        &
-	LexAda.obj		        &
-	LexAsm.obj		        &
-	LexBaan.obj		        &
-	LexBullant.obj		    &
-	LexMatlab.obj	    	&
-	LexCPP.obj		        &
-	LexConf.obj		        &
-	LexCrontab.obj		    &
-	LexCSS.obj		    &
-	LexEiffel.obj		    &
-	LexFortran.obj  	    &
-	LexHTML.obj		        &
-	LexLisp.obj		        &
-	LexLua.obj		        &
-	LexOthers.obj		    &
-	LexPOV.obj		    &
-	LexPascal.obj		    &
-	LexPerl.obj		        &
-	LexPython.obj		    &
-	LexRuby.obj		        &
-	LexSQL.obj		        &
-	LexVB.obj		        &
-    LineMarker.obj	    	&
-    PropSet.obj	            &
-	RESearch.obj		    &
-    ScintillaBase.obj	    &
-    Style.obj		        &
-	StyleContext.obj	    &
-	UniConversion.obj	    &
-    ViewStyle.obj		    &
-	WindowAccessor.obj	    &
-	XPM.obj			    &
-	PlatWX.obj              &
-	ScintillaWX.obj         &
-	stc.obj
-
-all: $(STCLIB) .SYMBOLIC
-
-$(STCLIB): $(OBJECTS)
-	*wlib /b /c /n /P=256 $(STCLIB) $(OBJECTS)
-
-clean:   .SYMBOLIC
-    -erase *.obj
-    -erase *.bak
-    -erase *.err
-    -erase *.pch
-    -erase $(STCLIB)
-    -erase *.lbc
-
-.EXTENSIONS: .cxx
-.cxx: $(S)
-
-.cxx.obj:
-    $(CXX) $[*.cxx $(CXXFLAGS) $(STCEXTRACPPFLAGS)
-
-

contrib/src/stc/scintilla/License.txt

@@ -1,20 +0,0 @@
-License for Scintilla and SciTE
-
-Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
-
-All Rights Reserved 
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that 
-both that copyright notice and this permission notice appear in 
-supporting documentation. 
-
-NEIL HODGSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
-AND FITNESS, IN NO EVENT SHALL NEIL HODGSON BE LIABLE FOR ANY 
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, 
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER 
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE 
-OR PERFORMANCE OF THIS SOFTWARE. 

contrib/src/stc/scintilla/README.txt

@@ -3,4 +3,5 @@ scintilla/include directories from the Scintilla/SCiTE source
 distribution.  All other code needed to implement Scintilla on top of
 wxWindows is located in the directory above this one.
 
-The current version of the Scintilla code is 1.52
+The current version of the Scintilla code is 1.48
+

contrib/src/stc/scintilla/include/Accessor.h

@@ -25,7 +25,7 @@ protected:
 	char buf[bufferSize+1];
 	int startPos;
 	int endPos;
-	int codePage;
+	int codePage;	
 
 	virtual bool InternalIsLeadByte(char ch)=0;
 	virtual void Fill(int position)=0;
@@ -44,7 +44,7 @@ public:
 		if (position < startPos || position >= endPos) {
 			Fill(position);
 			if (position < startPos || position >= endPos) {
-				// Position is outside range of document
+				// Position is outside range of document 
 				return chDefault;
 			}
 		}

contrib/src/stc/scintilla/include/KeyWords.h

@@ -7,7 +7,7 @@
 
 typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyle,
                   WordList *keywordlists[], Accessor &styler);
-
+                  
 /**
  * A LexerModule is responsible for lexing and folding a particular language.
  * The class maintains a list of LexerModules which can be searched to find a
@@ -26,7 +26,7 @@ protected:
 
 public:
 	const char *languageName;
-	LexerModule(int language_, LexerFunction fnLexer_,
+	LexerModule(int language_, LexerFunction fnLexer_, 
 		const char *languageName_=0, LexerFunction fnFolder_=0,
 		const char * const wordListDescriptions_[] = NULL);
 	int GetLanguage() const { return language; }

contrib/src/stc/scintilla/include/Platform.h

@@ -3,7 +3,7 @@
  ** Interface to platform facilities. Also includes some basic utilities.
  ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows.
  **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #ifndef PLATFORM_H
@@ -109,12 +109,6 @@ public:
 		return (right > other.left) && (left < other.right) &&
 			(bottom > other.top) && (top < other.bottom);
 	}
-	void Move(int xDelta, int yDelta) {
-		left += xDelta;
-		top += yDelta;
-		right += xDelta;
-		bottom += yDelta;
-	}
 	int Width() { return right - left; }
 	int Height() { return bottom - top; }
 };
@@ -142,7 +136,7 @@ public:
 	}
 
 	ColourDesired(unsigned int red, unsigned int green, unsigned int blue) {
-		Set(red, green, blue);
+		co = red | (green << 8) | (blue << 16);
 	}
 
 	bool operator==(const ColourDesired &other) const {
@@ -153,31 +147,6 @@ public:
 		co = lcol;
 	}
 
-	void Set(unsigned int red, unsigned int green, unsigned int blue) {
-		co = red | (green << 8) | (blue << 16);
-	}
-
-	static inline unsigned int ValueOfHex(const char ch) {
-		if (ch >= '0' && ch <= '9')
-			return ch - '0';
-		else if (ch >= 'A' && ch <= 'F')
-			return ch - 'A' + 10;
-		else if (ch >= 'a' && ch <= 'f')
-			return ch - 'a' + 10;
-		else
-			return 0;
-	}
-
-	void Set(const char *val) {
-		if (*val == '#') {
-			val++;
-		}
-		unsigned int r = ValueOfHex(val[0]) * 16 + ValueOfHex(val[1]);
-		unsigned int g = ValueOfHex(val[2]) * 16 + ValueOfHex(val[3]);
-		unsigned int b = ValueOfHex(val[4]) * 16 + ValueOfHex(val[5]);
-		Set(r, g, b);
-	}
-
 	long AsLong() const {
 		return co;
 	}
@@ -227,9 +196,6 @@ struct ColourPair {
 		desired = desired_;
 		allocated.Set(desired.AsLong());
 	}
-	void Copy() {
-		allocated.Set(desired.AsLong());
-	}
 };
 
 class Window;	// Forward declaration for Palette
@@ -305,9 +271,9 @@ public:
 	virtual ~Surface() {};
 	static Surface *Allocate();
 
-	virtual void Init(WindowID wid)=0;
+	virtual void Init()=0;
-	virtual void Init(SurfaceID sid, WindowID wid)=0;
+	virtual void Init(SurfaceID sid)=0;
-	virtual void InitPixMap(int width, int height, Surface *surface_, WindowID wid)=0;
+	virtual void InitPixMap(int width, int height, Surface *surface_)=0;
 
 	virtual void Release()=0;
 	virtual bool Initialised()=0;
@@ -326,7 +292,6 @@ public:
 
 	virtual void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back)=0;
 	virtual void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back)=0;
-	virtual void DrawTextTransparent(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore)=0;
 	virtual void MeasureWidths(Font &font_, const char *s, int len, int *positions)=0;
 	virtual int WidthText(Font &font_, const char *s, int len)=0;
 	virtual int WidthChar(Font &font_, char ch)=0;
@@ -342,7 +307,6 @@ public:
 	virtual void FlushCachedState()=0;
 
 	virtual void SetUnicodeMode(bool unicodeMode_)=0;
-	virtual void SetDBCSMode(int codePage)=0;
 };
 
 /**
@@ -365,8 +329,8 @@ public:
 		id = id_;
 		return *this;
 	}
-	WindowID GetID() const { return id; }
+	WindowID GetID() { return id; }
-	bool Created() const { return id != 0; }
+	bool Created() { return id != 0; }
 	void Destroy();
 	bool HasFocus();
 	PRectangle GetPosition();
@@ -377,7 +341,7 @@ public:
 	void InvalidateAll();
 	void InvalidateRectangle(PRectangle rc);
 	virtual void SetFont(Font &font);
-	enum Cursor { cursorInvalid, cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow, cursorHand };
+	enum Cursor { cursorInvalid, cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow };
 	void SetCursor(Cursor curs);
 	void SetTitle(const char *s);
 private:
@@ -389,28 +353,38 @@ private:
  */
 
 class ListBox : public Window {
+private:
+#if PLAT_GTK
+	WindowID list;
+	WindowID scroller;
+	int current;
+#endif
+	int desiredVisibleRows;
+	unsigned int maxItemCharacters;
+	unsigned int aveCharWidth;
+public:
+	CallBackAction doubleClickAction;
+	void *doubleClickActionData;
 public:
 	ListBox();
 	virtual ~ListBox();
-	static ListBox *Allocate();
+	void Create(Window &parent, int ctrlID);
-
+	virtual void SetFont(Font &font);
-	virtual void SetFont(Font &font)=0;
+	void SetAverageCharWidth(int width);
-	virtual void Create(Window &parent, int ctrlID, int lineHeight_, bool unicodeMode_)=0;
+	void SetVisibleRows(int rows);
-	virtual void SetAverageCharWidth(int width)=0;
+	PRectangle GetDesiredRect();
-	virtual void SetVisibleRows(int rows)=0;
+	void Clear();
-	virtual PRectangle GetDesiredRect()=0;
+	void Append(char *s);
-	virtual int CaretFromEdge()=0;
+	int Length();
-	virtual void Clear()=0;
+	void Select(int n);
-	virtual void Append(char *s, int type = -1)=0;
+	int GetSelection();
-	virtual int Length()=0;
+	int Find(const char *prefix);
-	virtual void Select(int n)=0;
+	void GetValue(int n, char *value, int len);
-	virtual int GetSelection()=0;
+	void Sort();
-	virtual int Find(const char *prefix)=0;
+	void SetDoubleClickAction(CallBackAction action, void *data) {
-	virtual void GetValue(int n, char *value, int len)=0;
+		doubleClickAction = action;
-	virtual void Sort()=0;
+		doubleClickActionData = data;
-	virtual void RegisterImage(int type, const char *xpm_data)=0;
+	}
-	virtual void ClearRegisteredImages()=0;
-	virtual void SetDoubleClickAction(CallBackAction, void *)=0;
 };
 
 /**
@@ -452,7 +426,6 @@ public:
 	static const char *DefaultFont();
 	static int DefaultFontSize();
 	static unsigned int DoubleClickTime();
-	static bool MouseButtonBounce();
 	static void DebugDisplay(const char *s);
 	static bool IsKeyDown(int key);
 	static long SendScintilla(
@@ -460,8 +433,6 @@ public:
 	static long SendScintillaPointer(
 		WindowID w, unsigned int msg, unsigned long wParam=0, void *lParam=0);
 	static bool IsDBCSLeadByte(int codePage, char ch);
-	static int DBCSCharLength(int codePage, const char *s);
-	static int DBCSCharMaxLength();
 
 	// These are utility functions not really tied to a platform
 	static int Minimum(int a, int b);

contrib/src/stc/scintilla/include/PropSet.h

@@ -60,7 +60,7 @@ public:
 	bool onlyLineEnds;	///< Delimited by any white space or only line ends
 	bool sorted;
 	int starts[256];
-	WordList(bool onlyLineEnds_ = false) :
+	WordList(bool onlyLineEnds_ = false) : 
 		words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), sorted(false) {}
 	~WordList() { Clear(); }
 	operator bool() { return len ? true : false; }
@@ -70,9 +70,9 @@ public:
 	char *Allocate(int size);
 	void SetFromAllocated();
 	bool InList(const char *s);
-	const char *GetNearestWord(const char *wordStart, int searchLen = -1,
+	const char *GetNearestWord(const char *wordStart, int searchLen = -1, 
 		bool ignoreCase = false, SString wordCharacters="");
-	char *GetNearestWords(const char *wordStart, int searchLen=-1,
+	char *GetNearestWords(const char *wordStart, int searchLen=-1, 
 		bool ignoreCase=false, char otherSeparator='\0');
 };
 

contrib/src/stc/scintilla/include/SString.h

@@ -238,7 +238,7 @@ public:
 		return append(sOther, static_cast<lenpos_t>(measure_length));
 	}
 	SString &operator+=(const SString &sOther) {
-		return append(sOther.s, sOther.sLen);
+		return append(sOther.s, sOther.sSize);
 	}
 	SString &operator+=(char ch) {
 		return append(&ch, 1);
@@ -369,7 +369,11 @@ public:
  */
 inline char *StringDup(
 	const char *s,			///< The string to duplicate
-	SString::lenpos_t len=SString::measure_length)	///< The length of memory to allocate. Optional.
+        /* gcc 2.96 doesn't seem to like this syntax: gives
+           'non-local function uses anonymous type'
+           SString::lenpos_t len=SString::measure_length)	///< The length of memory to allocate. Optional.
+        */
+        SString::lenpos_t len=0xffffffffU)	///< The length of memory to allocate. Optional.
 {
 	return SString::StringAllocate(s, len);
 }

contrib/src/stc/scintilla/include/SciLexer.h

@@ -48,12 +48,6 @@
 #define SCLEX_BAAN 31
 #define SCLEX_MATLAB 32
 #define SCLEX_SCRIPTOL 33
-#define SCLEX_ASM 34
-#define SCLEX_CPPNOCASE 35
-#define SCLEX_FORTRAN 36
-#define SCLEX_F77 37
-#define SCLEX_CSS 38
-#define SCLEX_POV 39
 #define SCLEX_AUTOMATIC 1000
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
@@ -279,9 +273,6 @@
 #define SCE_ERR_DIFF_ADDITION 11
 #define SCE_ERR_DIFF_DELETION 12
 #define SCE_ERR_DIFF_MESSAGE 13
-#define SCE_ERR_PHP 14
-#define SCE_ERR_ELF 15
-#define SCE_ERR_IFC 16
 #define SCE_BAT_DEFAULT 0
 #define SCE_BAT_COMMENT 1
 #define SCE_BAT_WORD 2
@@ -318,29 +309,22 @@
 #define SCE_AVE_COMMENT 1
 #define SCE_AVE_NUMBER 2
 #define SCE_AVE_WORD 3
+#define SCE_AVE_KEYWORD 4
+#define SCE_AVE_STATEMENT 5
 #define SCE_AVE_STRING 6
 #define SCE_AVE_ENUM 7
 #define SCE_AVE_STRINGEOL 8
 #define SCE_AVE_IDENTIFIER 9
 #define SCE_AVE_OPERATOR 10
-#define SCE_AVE_WORD1 11
-#define SCE_AVE_WORD2 12
-#define SCE_AVE_WORD3 13
-#define SCE_AVE_WORD4 14
-#define SCE_AVE_WORD5 15
-#define SCE_AVE_WORD6 16
 #define SCE_ADA_DEFAULT 0
-#define SCE_ADA_WORD 1
+#define SCE_ADA_COMMENT 1
-#define SCE_ADA_IDENTIFIER 2
+#define SCE_ADA_NUMBER 2
-#define SCE_ADA_NUMBER 3
+#define SCE_ADA_WORD 3
-#define SCE_ADA_DELIMITER 4
+#define SCE_ADA_STRING 4
 #define SCE_ADA_CHARACTER 5
-#define SCE_ADA_CHARACTEREOL 6
+#define SCE_ADA_OPERATOR 6
-#define SCE_ADA_STRING 7
+#define SCE_ADA_IDENTIFIER 7
 #define SCE_ADA_STRINGEOL 8
-#define SCE_ADA_LABEL 9
-#define SCE_ADA_COMMENTLINE 10
-#define SCE_ADA_ILLEGAL 11
 #define SCE_BAAN_DEFAULT 0
 #define SCE_BAAN_COMMENT 1
 #define SCE_BAAN_COMMENTDOC 2
@@ -408,58 +392,6 @@
 #define SCE_SCRIPTOL_COMMENTDOCKEYWORD 17
 #define SCE_SCRIPTOL_COMMENTDOCKEYWORDERROR 18
 #define SCE_SCRIPTOL_COMMENTBASIC 19
-#define SCE_ASM_DEFAULT 0
-#define SCE_ASM_COMMENT 1
-#define SCE_ASM_NUMBER 2
-#define SCE_ASM_STRING 3
-#define SCE_ASM_OPERATOR 4
-#define SCE_ASM_IDENTIFIER 5
-#define SCE_ASM_CPUINSTRUCTION 6
-#define SCE_ASM_MATHINSTRUCTION 7
-#define SCE_ASM_REGISTER 8
-#define SCE_ASM_DIRECTIVE 9
-#define SCE_ASM_DIRECTIVEOPERAND 10
-#define SCE_F_DEFAULT 0
-#define SCE_F_COMMENT 1
-#define SCE_F_NUMBER 2
-#define SCE_F_STRING1 3
-#define SCE_F_STRING2 4
-#define SCE_F_STRINGEOL 5
-#define SCE_F_OPERATOR 6
-#define SCE_F_IDENTIFIER 7
-#define SCE_F_WORD 8
-#define SCE_F_WORD2 9
-#define SCE_F_WORD3 10
-#define SCE_F_PREPROCESSOR 11
-#define SCE_F_OPERATOR2 12
-#define SCE_F_LABEL 13
-#define SCE_F_CONTINUATION 14
-#define SCE_CSS_DEFAULT 0
-#define SCE_CSS_TAG 1
-#define SCE_CSS_CLASS 2
-#define SCE_CSS_PSEUDOCLASS 3
-#define SCE_CSS_UNKNOWN_PSEUDOCLASS 4
-#define SCE_CSS_OPERATOR 5
-#define SCE_CSS_IDENTIFIER 6
-#define SCE_CSS_UNKNOWN_IDENTIFIER 7
-#define SCE_CSS_VALUE 8
-#define SCE_CSS_COMMENT 9
-#define SCE_CSS_ID 10
-#define SCE_CSS_IMPORTANT 11
-#define SCE_CSS_DIRECTIVE 12
-#define SCE_CSS_DOUBLESTRING 13
-#define SCE_CSS_SINGLESTRING 14
-#define SCE_POV_DEFAULT 0
-#define SCE_POV_COMMENT 1
-#define SCE_POV_COMMENTLINE 2
-#define SCE_POV_COMMENTDOC 3
-#define SCE_POV_NUMBER 4
-#define SCE_POV_WORD 5
-#define SCE_POV_STRING 6
-#define SCE_POV_OPERATOR 7
-#define SCE_POV_IDENTIFIER 8
-#define SCE_POV_BRACE 9
-#define SCE_POV_WORD2 10
 //--Autogenerated -- end of section automatically generated from Scintilla.iface
 
 #endif

contrib/src/stc/scintilla/include/Scintilla.h

@@ -2,7 +2,7 @@
 /** @file Scintilla.h
  ** Interface to the edit control.
  **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 // Most of this file is automatically generated from the Scintilla.iface interface definition
@@ -83,7 +83,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_SETTABWIDTH 2036
 #define SCI_GETTABWIDTH 2121
 #define SC_CP_UTF8 65001
-#define SC_CP_DBCS 1
 #define SCI_SETCODEPAGE 2037
 #define SCI_SETUSEPALETTE 2039
 #define MARKER_MAX 31
@@ -112,7 +111,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SC_MARK_BACKGROUND 22
 #define SC_MARK_DOTDOTDOT 23
 #define SC_MARK_ARROWS 24
-#define SC_MARK_PIXMAP 25
 #define SC_MARK_CHARACTER 10000
 #define SC_MARKNUM_FOLDEREND 25
 #define SC_MARKNUM_FOLDEROPENMID 26
@@ -131,7 +129,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_MARKERGET 2046
 #define SCI_MARKERNEXT 2047
 #define SCI_MARKERPREVIOUS 2048
-#define SCI_MARKERDEFINEPIXMAP 2049
 #define SC_MARGIN_SYMBOL 0
 #define SC_MARGIN_NUMBER 1
 #define SCI_SETMARGINTYPEN 2240
@@ -184,7 +181,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SC_CASE_LOWER 2
 #define SCI_STYLESETCASE 2060
 #define SCI_STYLESETCHARACTERSET 2066
-#define SCI_STYLESETHOTSPOT 2409
 #define SCI_SETSELFORE 2067
 #define SCI_SETSELBACK 2068
 #define SCI_SETCARETFORE 2069
@@ -245,10 +241,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_AUTOCGETAUTOHIDE 2119
 #define SCI_AUTOCSETDROPRESTOFWORD 2270
 #define SCI_AUTOCGETDROPRESTOFWORD 2271
-#define SCI_REGISTERIMAGE 2405
-#define SCI_CLEARREGISTEREDIMAGES 2408
-#define SCI_AUTOCGETTYPESEPARATOR 2285
-#define SCI_AUTOCSETTYPESEPARATOR 2286
 #define SCI_SETINDENT 2122
 #define SCI_GETINDENT 2123
 #define SCI_SETUSETABS 2124
@@ -286,7 +278,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCFIND_MATCHCASE 4
 #define SCFIND_WORDSTART 0x00100000
 #define SCFIND_REGEXP 0x00200000
-#define SCFIND_POSIX 0x00400000
 #define SCI_FINDTEXT 2150
 #define SCI_FORMATRANGE 2151
 #define SCI_GETFIRSTVISIBLELINE 2152
@@ -342,17 +333,11 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_CALLTIPPOSSTART 2203
 #define SCI_CALLTIPSETHLT 2204
 #define SCI_CALLTIPSETBACK 2205
-#define SCI_CALLTIPSETFORE 2206
-#define SCI_CALLTIPSETFOREHLT 2207
 #define SCI_VISIBLEFROMDOCLINE 2220
 #define SCI_DOCLINEFROMVISIBLE 2221
 #define SC_FOLDLEVELBASE 0x400
 #define SC_FOLDLEVELWHITEFLAG 0x1000
 #define SC_FOLDLEVELHEADERFLAG 0x2000
-#define SC_FOLDLEVELBOXHEADERFLAG 0x4000
-#define SC_FOLDLEVELBOXFOOTERFLAG 0x8000
-#define SC_FOLDLEVELCONTRACTED 0x10000
-#define SC_FOLDLEVELUNINDENT 0x20000
 #define SC_FOLDLEVELNUMBERMASK 0x0FFF
 #define SCI_SETFOLDLEVEL 2222
 #define SCI_GETFOLDLEVEL 2223
@@ -365,12 +350,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_GETFOLDEXPANDED 2230
 #define SCI_TOGGLEFOLD 2231
 #define SCI_ENSUREVISIBLE 2232
-#define SC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002
-#define SC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004
-#define SC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008
-#define SC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010
-#define SC_FOLDFLAG_LEVELNUMBERS 0x0040
-#define SC_FOLDFLAG_BOX 0x0001
 #define SCI_SETFOLDFLAGS 2233
 #define SCI_ENSUREVISIBLEENFORCEPOLICY 2234
 #define SCI_SETTABINDENTS 2260
@@ -398,16 +377,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_SETENDATLASTLINE 2277
 #define SCI_GETENDATLASTLINE 2278
 #define SCI_TEXTHEIGHT 2279
-#define SCI_SETVSCROLLBAR 2280
-#define SCI_GETVSCROLLBAR 2281
-#define SCI_APPENDTEXT 2282
-#define SCI_GETTWOPHASEDRAW 2283
-#define SCI_SETTWOPHASEDRAW 2284
-#define SCI_TARGETFROMSELECTION 2287
-#define SCI_LINESJOIN 2288
-#define SCI_LINESSPLIT 2289
-#define SCI_SETFOLDMARGINCOLOUR 2290
-#define SCI_SETFOLDMARGINHICOLOUR 2291
 #define SCI_LINEDOWN 2300
 #define SCI_LINEDOWNEXTEND 2301
 #define SCI_LINEUP 2302
@@ -448,7 +417,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_LINECUT 2337
 #define SCI_LINEDELETE 2338
 #define SCI_LINETRANSPOSE 2339
-#define SCI_LINEDUPLICATE 2404
 #define SCI_LOWERCASE 2340
 #define SCI_UPPERCASE 2341
 #define SCI_LINESCROLLDOWN 2342
@@ -458,12 +426,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_HOMEDISPLAYEXTEND 2346
 #define SCI_LINEENDDISPLAY 2347
 #define SCI_LINEENDDISPLAYEXTEND 2348
-#define SCI_HOMEWRAP 2349
-#define SCI_HOMEWRAPEXTEND 2450
-#define SCI_LINEENDWRAP 2451
-#define SCI_LINEENDWRAPEXTEND 2452
-#define SCI_VCHOMEWRAP 2453
-#define SCI_VCHOMEWRAPEXTEND 2454
 #define SCI_MOVECARETINSIDEVIEW 2401
 #define SCI_LINELENGTH 2350
 #define SCI_BRACEHIGHLIGHT 2351
@@ -502,7 +464,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_SETMOUSEDOWNCAPTURES 2384
 #define SCI_GETMOUSEDOWNCAPTURES 2385
 #define SC_CURSORNORMAL -1
-#define SC_CURSORWAIT 4
+#define SC_CURSORWAIT 3
 #define SCI_SETCURSOR 2386
 #define SCI_GETCURSOR 2387
 #define SCI_SETCONTROLCHARSYMBOL 2388
@@ -518,7 +480,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_DELLINERIGHT 2396
 #define SCI_SETXOFFSET 2397
 #define SCI_GETXOFFSET 2398
-#define SCI_CHOOSECARETX 2399
 #define SCI_GRABFOCUS 2400
 #define CARET_SLOP 0x01
 #define CARET_STRICT 0x04
@@ -526,15 +487,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define CARET_EVEN 0x08
 #define SCI_SETXCARETPOLICY 2402
 #define SCI_SETYCARETPOLICY 2403
-#define SCI_SETPRINTWRAPMODE 2406
-#define SCI_GETPRINTWRAPMODE 2407
-#define SCI_SETHOTSPOTACTIVEFORE 2410
-#define SCI_SETHOTSPOTACTIVEBACK 2411
-#define SCI_SETHOTSPOTACTIVEUNDERLINE 2412
-#define SCI_PARADOWN 2413
-#define SCI_PARADOWNEXTEND 2414
-#define SCI_PARAUP 2415
-#define SCI_PARAUPEXTEND 2416
 #define SCI_STARTRECORD 3001
 #define SCI_STOPRECORD 3002
 #define SCI_SETLEXER 4001
@@ -543,7 +495,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_SETPROPERTY 4004
 #define SCI_SETKEYWORDS 4005
 #define SCI_SETLEXERLANGUAGE 4006
-#define SCI_LOADLEXERLIBRARY 4007
 #define SC_MOD_INSERTTEXT 0x1
 #define SC_MOD_DELETETEXT 0x2
 #define SC_MOD_CHANGESTYLE 0x4
@@ -597,9 +548,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCN_DWELLSTART 2016
 #define SCN_DWELLEND 2017
 #define SCN_ZOOM 2018
-#define SCN_HOTSPOTCLICK 2019
-#define SCN_HOTSPOTDOUBLECLICK 2020
-#define SCN_CALLTIPCLICK 2021
 //--Autogenerated -- end of section automatically generated from Scintilla.iface
 
 // These structures are defined to be exactly the same shape as the Win32

contrib/src/stc/scintilla/include/Scintilla.iface

@@ -221,9 +221,6 @@ get int GetTabWidth=2121(,)
 # This is the same value as CP_UTF8 in Windows
 val SC_CP_UTF8=65001
 
-# The SC_CP_DBCS value can be used to indicate a DBCS mode for GTK+.
-val SC_CP_DBCS=1
-
 # Set the code page used to interpret the bytes of the document as characters.
 # The SC_CP_UTF8 value can be used to enter Unicode mode.
 set void SetCodePage=2037(int codePage,)
@@ -263,7 +260,6 @@ val SC_MARK_CIRCLEMINUSCONNECTED=21
 val SC_MARK_BACKGROUND=22
 val SC_MARK_DOTDOTDOT=23
 val SC_MARK_ARROWS=24
-val SC_MARK_PIXMAP=25
 
 val SC_MARK_CHARACTER=10000
 
@@ -306,9 +302,6 @@ fun int MarkerNext=2047(int lineStart, int markerMask)
 # Find the previous line before lineStart that includes a marker in mask.
 fun int MarkerPrevious=2048(int lineStart, int markerMask)
 
-# Define a marker from a pixmap.
-fun void MarkerDefinePixmap=2049(int markerNumber, string pixmap)
-
 enu MarginType=SC_MARGIN_
 val SC_MARGIN_SYMBOL=0
 val SC_MARGIN_NUMBER=1
@@ -412,9 +405,6 @@ set void StyleSetCase=2060(int style, int caseForce)
 # Set the character set of the font in a style.
 set void StyleSetCharacterSet=2066(int style, int characterSet)
 
-# Set a style to be a hotspot or not.
-set void StyleSetHotSpot=2409(int style, bool hotspot)
-
 # Set the foreground colour of the selection and whether to use this setting.
 fun void SetSelFore=2067(bool useSetting, colour fore)
 
@@ -588,19 +578,6 @@ set void AutoCSetDropRestOfWord=2270(bool dropRestOfWord,)
 # after the inserted text upon completion.
 get bool AutoCGetDropRestOfWord=2271(,)
 
-# Register an XPM image for use in autocompletion lists.
-fun void RegisterImage=2405(int type, string xpmData)
-
-# Clear all the registered XPM images.
-fun void ClearRegisteredImages=2408(,)
-
-# Retrieve the auto-completion list type-separator character.
-get int AutoCGetTypeSeparator=2285(,)
-
-# Change the type-separator character in the string setting up an auto-completion list.
-# Default is '?' but can be changed if items contain '?'.
-set void AutoCSetTypeSeparator=2286(int separatorCharacter,)
-
 # Set the number of spaces used for one level of indentation.
 set void SetIndent=2122(int indentSize,)
 
@@ -704,7 +681,6 @@ val SCFIND_WHOLEWORD=2
 val SCFIND_MATCHCASE=4
 val SCFIND_WORDSTART=0x00100000
 val SCFIND_REGEXP=0x00200000
-val SCFIND_POSIX=0x00400000
 
 # Find some text in the document.
 fun position FindText=2150(int flags, findtext ft)
@@ -712,7 +688,7 @@ fun position FindText=2150(int flags, findtext ft)
 # On Windows, will draw the document into a display context such as a printer.
 fun void FormatRange=2151(bool draw, formatrange fr)
 
-# Retrieve the display line at the top of the display.
+# Retrieve the line at the top of the display.
 get int GetFirstVisibleLine=2152(,)
 
 # Retrieve the contents of a line.
@@ -887,12 +863,6 @@ fun void CallTipSetHlt=2204(int start, int end)
 # Set the background colour for the call tip.
 set void CallTipSetBack=2205(colour back,)
 
-# Set the foreground colour for the call tip.
-set void CallTipSetFore=2206(colour fore,)
-
-# Set the foreground colour for the highlighted part of the call tip.
-set void CallTipSetForeHlt=2207(colour fore,)
-
 # Find the display line of a document line taking hidden lines into account.
 fun int VisibleFromDocLine=2220(int line,)
 
@@ -903,10 +873,6 @@ enu FoldLevel=SC_FOLDLEVEL
 val SC_FOLDLEVELBASE=0x400
 val SC_FOLDLEVELWHITEFLAG=0x1000
 val SC_FOLDLEVELHEADERFLAG=0x2000
-val SC_FOLDLEVELBOXHEADERFLAG=0x4000
-val SC_FOLDLEVELBOXFOOTERFLAG=0x8000
-val SC_FOLDLEVELCONTRACTED=0x10000
-val SC_FOLDLEVELUNINDENT=0x20000
 val SC_FOLDLEVELNUMBERMASK=0x0FFF
 
 # Set the fold level of a line.
@@ -944,15 +910,7 @@ fun void ToggleFold=2231(int line,)
 # Ensure a particular line is visible by expanding any header line hiding it.
 fun void EnsureVisible=2232(int line,)
 
-enu FoldFlag=SC_FOLDFLAG_
+# Set some debugging options for folding.
-val SC_FOLDFLAG_LINEBEFORE_EXPANDED=0x0002
-val SC_FOLDFLAG_LINEBEFORE_CONTRACTED=0x0004
-val SC_FOLDFLAG_LINEAFTER_EXPANDED=0x0008
-val SC_FOLDFLAG_LINEAFTER_CONTRACTED=0x0010
-val SC_FOLDFLAG_LEVELNUMBERS=0x0040
-val SC_FOLDFLAG_BOX=0x0001
-
-# Set some style options for folding.
 fun void SetFoldFlags=2233(int flags,)
 
 # Ensure a particular line is visible by expanding any header line hiding it.
@@ -1030,38 +988,6 @@ get int GetEndAtLastLine=2278(,)
 # Retrieve the height of a particular line of text in pixels.
 fun int TextHeight=2279(int line,)
 
-# Show or hide the vertical scroll bar.
-set void SetVScrollBar=2280(bool show,)
-
-# Is the vertical scroll bar visible?
-get bool GetVScrollBar=2281(,)
-
-# Append a string to the end of the document without changing the selection.
-fun void AppendText=2282(int length, string text)
-
-# Is drawing done in two phases with backgrounds drawn before foregrounds?
-get bool GetTwoPhaseDraw=2283(,)
-
-# In twoPhaseDraw mode, drawing is performed in two phases, first the background
-# and then the foreground. This avoids chopping off characters that overlap the next run.
-set void SetTwoPhaseDraw=2284(bool twoPhase,)
-
-# Make the target range start and end be the same as the selection range start and end.
-fun void TargetFromSelection=2287(,)
-
-# Join the lines in the target.
-fun void LinesJoin=2288(,)
-
-# Split the lines in the target into lines that are less wide than pixelWidth
-# where possible.
-fun void LinesSplit=2289(int pixelWidth,)
-
-# Set the colours used as a chequerboard pattern in the fold margin
-fun void SetFoldMarginColour=2290(bool useSetting, colour back)
-fun void SetFoldMarginHiColour=2291(bool useSetting, colour fore)
-
-## New messages go here
-
 ## Start of key messages
 # Move caret down one line.
 fun void LineDown=2300(,)
@@ -1185,9 +1111,6 @@ fun void LineDelete=2338(,)
 # Switch the current line with the previous.
 fun void LineTranspose=2339(,)
 
-# Duplicate the current line.
-fun void LineDuplicate=2404(,)
-
 # Transform the selection to lower case.
 fun void LowerCase=2340(,)
 
@@ -1218,19 +1141,6 @@ fun void LineEndDisplay=2347(,)
 # caret position.
 fun void LineEndDisplayExtend=2348(,)
 
-# These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-# except they behave differently when word-wrap is enabled:
-# They go first to the start / end of the display line, like (Home|LineEnd)Display
-# The difference is that, the cursor is already at the point, it goes on to the start
-# or end of the document line, as appropriate for (Home|LineEnd|VCHome)Extend.
-
-fun void HomeWrap=2349(,)
-fun void HomeWrapExtend=2450(,)
-fun void LineEndWrap=2451(,)
-fun void LineEndWrapExtend=2452(,)
-fun void VCHomeWrap=2453(,)
-fun void VCHomeWrapExtend=2454(,)
-
 # Move the caret inside current view if it's not there already.
 fun void MoveCaretInsideView=2401(,)
 
@@ -1341,7 +1251,7 @@ get bool GetMouseDownCaptures=2385(,)
 
 enu CursorShape=SC_CURSOR
 val SC_CURSORNORMAL=-1
-val SC_CURSORWAIT=4
+val SC_CURSORWAIT=3
 # Sets the cursor to one of the SC_CURSOR* values.
 set void SetCursor=2386(int cursorType,)
 # Get cursor type.
@@ -1381,9 +1291,6 @@ fun void DelLineRight=2396(,)
 set void SetXOffset=2397(int newOffset,)
 get int GetXOffset=2398(,)
 
-# Set the last x chosen value to be the caret x position
-fun void ChooseCaretX=2399(,)
-
 # Set the focus to this Scintilla widget.
 # GTK+ Specific.
 fun void GrabFocus=2400(,)
@@ -1420,27 +1327,6 @@ fun void SetXCaretPolicy=2402(int caretPolicy, int caretSlop)
 # The exclusion zone is given in lines.
 fun void SetYCaretPolicy=2403(int caretPolicy, int caretSlop)
 
-# Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
-set void SetPrintWrapMode=2406(int mode,)
-
-# Is printing line wrapped.
-get int GetPrintWrapMode=2407(,)
-
-# Set a fore colour for active hotspots.
-set void SetHotspotActiveFore=2410(bool useSetting, colour fore)
-
-# Set a back colour for active hotspots.
-set void SetHotspotActiveBack=2411(bool useSetting, colour back)
-
-# Enable / Disable underlining active hotspots.
-set void SetHotspotActiveUnderline=2412(bool underline,)
-
-# Move caret between paragraphs (delimited by empty lines)
-fun void ParaDown=2413(,)
-fun void ParaDownExtend=2414(,)
-fun void ParaUp=2415(,)
-fun void ParaUpExtend=2416(,)
-
 # Start notifying the container of all key presses and commands.
 fun void StartRecord=3001(,)
 
@@ -1465,10 +1351,6 @@ set void SetKeyWords=4005(int keywordSet, string keyWords)
 # Set the lexing language of the document based on string name.
 set void SetLexerLanguage=4006(, string language)
 
-# Load a lexer library (dll / so)
-# NOT YET IMPLEMENTED
-fun void LoadLexerLibrary=4007(, string path)
-
 # Notifications
 # Type of modification and the action which caused the modification.
 # These are defined as a bit mask to make it easy to specify which notifications are wanted.
@@ -1560,12 +1442,6 @@ val SCLEX_PHP=30
 val SCLEX_BAAN=31
 val SCLEX_MATLAB=32
 val SCLEX_SCRIPTOL=33
-val SCLEX_ASM=34
-val SCLEX_CPPNOCASE=35
-val SCLEX_FORTRAN=36
-val SCLEX_F77=37
-val SCLEX_CSS=38
-val SCLEX_POV=39
 
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -1832,9 +1708,6 @@ val SCE_ERR_DIFF_CHANGED=10
 val SCE_ERR_DIFF_ADDITION=11
 val SCE_ERR_DIFF_DELETION=12
 val SCE_ERR_DIFF_MESSAGE=13
-val SCE_ERR_PHP=14
-val SCE_ERR_ELF=15
-val SCE_ERR_IFC=16
 # Lexical states for SCLEX_BATCH
 lex Batch=SCLEX_BATCH SCE_BAT_
 val SCE_BAT_DEFAULT=0
@@ -1881,31 +1754,24 @@ val SCE_AVE_DEFAULT=0
 val SCE_AVE_COMMENT=1
 val SCE_AVE_NUMBER=2
 val SCE_AVE_WORD=3
+val SCE_AVE_KEYWORD=4
+val SCE_AVE_STATEMENT=5
 val SCE_AVE_STRING=6
 val SCE_AVE_ENUM=7
 val SCE_AVE_STRINGEOL=8
 val SCE_AVE_IDENTIFIER=9
 val SCE_AVE_OPERATOR=10
-val SCE_AVE_WORD1=11
-val SCE_AVE_WORD2=12
-val SCE_AVE_WORD3=13
-val SCE_AVE_WORD4=14
-val SCE_AVE_WORD5=15
-val SCE_AVE_WORD6=16
 # Lexical states for SCLEX_ADA
 lex Ada=SCLEX_ADA SCE_ADA_
 val SCE_ADA_DEFAULT=0
-val SCE_ADA_WORD=1
+val SCE_ADA_COMMENT=1
-val SCE_ADA_IDENTIFIER=2
+val SCE_ADA_NUMBER=2
-val SCE_ADA_NUMBER=3
+val SCE_ADA_WORD=3
-val SCE_ADA_DELIMITER=4
+val SCE_ADA_STRING=4
 val SCE_ADA_CHARACTER=5
-val SCE_ADA_CHARACTEREOL=6
+val SCE_ADA_OPERATOR=6
-val SCE_ADA_STRING=7
+val SCE_ADA_IDENTIFIER=7
 val SCE_ADA_STRINGEOL=8
-val SCE_ADA_LABEL=9
-val SCE_ADA_COMMENTLINE=10
-val SCE_ADA_ILLEGAL=11
 # Lexical states for SCLEX_BAAN
 lex Baan=SCLEX_BAAN SCE_BAAN_
 val SCE_BAAN_DEFAULT=0
@@ -1986,67 +1852,7 @@ val SCE_SCRIPTOL_WORD2=16
 val SCE_SCRIPTOL_COMMENTDOCKEYWORD=17
 val SCE_SCRIPTOL_COMMENTDOCKEYWORDERROR=18
 val SCE_SCRIPTOL_COMMENTBASIC=19
-# Lexical states for SCLEX_ASM
+
-lex Asm=SCLEX_ASM SCE_ASM_
-val SCE_ASM_DEFAULT=0
-val SCE_ASM_COMMENT=1
-val SCE_ASM_NUMBER=2
-val SCE_ASM_STRING=3
-val SCE_ASM_OPERATOR=4
-val SCE_ASM_IDENTIFIER=5
-val SCE_ASM_CPUINSTRUCTION=6
-val SCE_ASM_MATHINSTRUCTION=7
-val SCE_ASM_REGISTER=8
-val SCE_ASM_DIRECTIVE=9
-val SCE_ASM_DIRECTIVEOPERAND=10
-# Lexical states for SCLEX_FORTRAN
-lex Fortran=SCLEX_FORTRAN SCE_F_
-lex F77=SCLEX_F77 SCE_F_
-val SCE_F_DEFAULT=0
-val SCE_F_COMMENT=1
-val SCE_F_NUMBER=2
-val SCE_F_STRING1=3
-val SCE_F_STRING2=4
-val SCE_F_STRINGEOL=5
-val SCE_F_OPERATOR=6
-val SCE_F_IDENTIFIER=7
-val SCE_F_WORD=8
-val SCE_F_WORD2=9
-val SCE_F_WORD3=10
-val SCE_F_PREPROCESSOR=11
-val SCE_F_OPERATOR2=12
-val SCE_F_LABEL=13
-val SCE_F_CONTINUATION=14
-# Lexical states for SCLEX_CSS
-lex CSS=SCLEX_CSS SCE_CSS_
-val SCE_CSS_DEFAULT=0
-val SCE_CSS_TAG=1
-val SCE_CSS_CLASS=2
-val SCE_CSS_PSEUDOCLASS=3
-val SCE_CSS_UNKNOWN_PSEUDOCLASS=4
-val SCE_CSS_OPERATOR=5
-val SCE_CSS_IDENTIFIER=6
-val SCE_CSS_UNKNOWN_IDENTIFIER=7
-val SCE_CSS_VALUE=8
-val SCE_CSS_COMMENT=9
-val SCE_CSS_ID=10
-val SCE_CSS_IMPORTANT=11
-val SCE_CSS_DIRECTIVE=12
-val SCE_CSS_DOUBLESTRING=13
-val SCE_CSS_SINGLESTRING=14
-# Lexical states for SCLEX_POV
-lex POV=SCLEX_POV SCE_POV_
-val SCE_POV_DEFAULT=0
-val SCE_POV_COMMENT=1
-val SCE_POV_COMMENTLINE=2
-val SCE_POV_COMMENTDOC=3
-val SCE_POV_NUMBER=4
-val SCE_POV_WORD=5
-val SCE_POV_STRING=6
-val SCE_POV_OPERATOR=7
-val SCE_POV_IDENTIFIER=8
-val SCE_POV_BRACE=9
-val SCE_POV_WORD2=10
 # Events
 
 evt void StyleNeeded=2000(int position)
@@ -2068,9 +1874,6 @@ evt void URIDropped=2015(string text)
 evt void DwellStart=2016(int position)
 evt void DwellEnd=2017(int position)
 evt void Zoom=2018(void)
-evt void HotSpotClick=2019(int modifiers, int position)
-evt void HotSpotDoubleClick=2020(int modifiers, int position)
-evt void CallTipClick=2021(int position)
 
 cat Deprecated
 

contrib/src/stc/scintilla/include/ScintillaWidget.h

@@ -37,8 +37,7 @@ struct _ScintillaClass {
 guint		scintilla_get_type	(void);
 GtkWidget*	scintilla_new		(void);
 void		scintilla_set_id	(ScintillaObject *sci,int id);
-sptr_t		scintilla_send_message	(ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+sptr_t	scintilla_send_message	(ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam);
-void		scintilla_release_resources(void);
 
 #if GTK_MAJOR_VERSION < 2
 #define SCINTILLA_NOTIFY "notify"

contrib/src/stc/scintilla/include/WindowAccessor.h

@@ -26,8 +26,8 @@ protected:
 	bool InternalIsLeadByte(char ch);
 	void Fill(int position);
 public:
-	WindowAccessor(WindowID id_, PropSet &props_) :
+	WindowAccessor(WindowID id_, PropSet &props_) : 
-		Accessor(), id(id_), props(props_),
+		Accessor(), id(id_), props(props_), 
 		lenDoc(-1), validLen(0), chFlags(0), chWhile(0) {
 	}
 	~WindowAccessor();
@@ -40,8 +40,8 @@ public:
 	void Flush();
 	int GetLineState(int line);
 	int SetLineState(int line, int state);
-	int GetPropertyInt(const char *key, int defaultValue=0) {
+	int GetPropertyInt(const char *key, int defaultValue=0) { 
-		return props.GetInt(key, defaultValue);
+		return props.GetInt(key, defaultValue); 
 	}
 	char *GetProperties() {
 		return props.ToString();

contrib/src/stc/scintilla/src/AutoComplete.cxx

@@ -2,7 +2,7 @@
 /** @file AutoComplete.cxx
  ** Defines the auto completion list box.
  **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #include <stdlib.h>
@@ -14,42 +14,33 @@
 #include "PropSet.h"
 #include "AutoComplete.h"
 
-AutoComplete::AutoComplete() :
+AutoComplete::AutoComplete() : 
 	active(false),
 	separator(' '),
-	typesep('?'),
 	ignoreCase(false),
 	chooseSingle(false),
-	lb(0),
 	posStart(0),
 	startLen(0),
 	cancelAtStartPos(true),
 	autoHide(true),
 	dropRestOfWord(false)	{
-	lb = ListBox::Allocate();
 	stopChars[0] = '\0';
 	fillUpChars[0] = '\0';
 }
 
 AutoComplete::~AutoComplete() {
-	if (lb) {
+	lb.Destroy();
-		lb->Destroy();
-		delete lb;
-		lb = 0;
-	}
 }
 
 bool AutoComplete::Active() {
 	return active;
 }
 
-void AutoComplete::Start(Window &parent, int ctrlID, int position,
+void AutoComplete::Start(Window &parent, int ctrlID, int position, int startLen_) {
-	int startLen_, int lineHeight, bool unicodeMode) {
+	if (!lb.Created()) {
-	if (active) {
+		lb.Create(parent, ctrlID);
-		Cancel();
 	}
-	lb->Create(parent, ctrlID, lineHeight, unicodeMode);
+	lb.Clear();
-	lb->Clear();
 	active = true;
 	startLen = startLen_;
 	posStart = position;
@@ -72,7 +63,7 @@ void AutoComplete::SetFillUpChars(const char *fillUpChars_) {
 bool AutoComplete::IsFillUpChar(char ch) {
 	return ch && strchr(fillUpChars, ch);
 }
-
+ 
 void AutoComplete::SetSeparator(char separator_) {
 	separator = separator_;
 }
@@ -81,65 +72,49 @@ char AutoComplete::GetSeparator() {
 	return separator;
 }
 
-void AutoComplete::SetTypesep(char separator_) {
-	typesep = separator_;
-}
-
-char AutoComplete::GetTypesep() {
-	return typesep;
-}
-
 void AutoComplete::SetList(const char *list) {
-	lb->Clear();
+	lb.Clear();
 	char *words = new char[strlen(list) + 1];
 	if (words) {
 		strcpy(words, list);
 		char *startword = words;
-		char *numword = NULL;
 		int i = 0;
 		for (; words && words[i]; i++) {
 			if (words[i] == separator) {
 				words[i] = '\0';
-				if (numword)
+				lb.Append(startword);
-					*numword = '\0';
-				lb->Append(startword, numword?atoi(numword + 1):-1);
 				startword = words + i + 1;
-				numword = NULL;
-			} else if (words[i] == typesep) {
-				numword = words + i;
 			}
 		}
 		if (startword) {
-			if (numword)
+			lb.Append(startword);
-				*numword = '\0';
-			lb->Append(startword, numword?atoi(numword + 1):-1);
 		}
 		delete []words;
 	}
 }
 
 void AutoComplete::Show() {
-	lb->Show();
+	lb.Show();
-	lb->Select(0);
+	lb.Select(0);
 }
 
 void AutoComplete::Cancel() {
-	if (lb->Created()) {
+	if (lb.Created()) {
-		lb->Destroy();
+		lb.Destroy();
 		active = false;
 	}
 }
 
 
 void AutoComplete::Move(int delta) {
-	int count = lb->Length();
+	int count = lb.Length();
-	int current = lb->GetSelection();
+	int current = lb.GetSelection();
 	current += delta;
 	if (current >= count)
 		current = count - 1;
 	if (current < 0)
 		current = 0;
-	lb->Select(current);
+	lb.Select(current);
 }
 
 void AutoComplete::Select(const char *word) {
@@ -148,10 +123,10 @@ void AutoComplete::Select(const char *word) {
 	const int maxItemLen=1000;
 	char item[maxItemLen];
 	int start = 0; // lower bound of the api array block to search
-	int end = lb->Length() - 1; // upper bound of the api array block to search
+	int end = lb.Length() - 1; // upper bound of the api array block to search
 	while ((start <= end) && (location == -1)) { // Binary searching loop
 		int pivot = (start + end) / 2;
-		lb->GetValue(pivot, item, maxItemLen);
+		lb.GetValue(pivot, item, maxItemLen);
 		int cond;
 		if (ignoreCase)
 			cond = CompareNCaseInsensitive(word, item, lenWord);
@@ -160,7 +135,7 @@ void AutoComplete::Select(const char *word) {
 		if (!cond) {
 			// Find first match
 			while (pivot > start) {
-				lb->GetValue(pivot-1, item, maxItemLen);
+				lb.GetValue(pivot-1, item, maxItemLen);
 				if (ignoreCase)
 					cond = CompareNCaseInsensitive(word, item, lenWord);
 				else
@@ -179,6 +154,6 @@ void AutoComplete::Select(const char *word) {
 	if (location == -1 && autoHide)
 		Cancel();
 	else
-		lb->Select(location);
+		lb.Select(location);
 }
 

contrib/src/stc/scintilla/src/AutoComplete.h

@@ -2,7 +2,7 @@
 /** @file AutoComplete.h
  ** Defines the auto completion list box.
  **/
-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #ifndef AUTOCOMPLETE_H
@@ -15,12 +15,11 @@ class AutoComplete {
 	char stopChars[256];
 	char fillUpChars[256];
 	char separator;
-	char typesep; // Type seperator
 
 public:
 	bool ignoreCase;
 	bool chooseSingle;
-	ListBox *lb;
+	ListBox lb;
 	int posStart;
 	int startLen;
 	/// Should autocompletion be canceled if editor's currentPos <= startPos?
@@ -35,8 +34,7 @@ public:
 	bool Active();
 
 	/// Display the auto completion list positioned to be near a character position
-	void Start(Window &parent, int ctrlID, int position,
+	void Start(Window &parent, int ctrlID, int position, int startLen_);
-		int startLen_, int lineHeight, bool unicodeMode);
 
 	/// The stop chars are characters which, when typed, cause the auto completion list to disappear
 	void SetStopChars(const char *stopChars_);
@@ -50,10 +48,6 @@ public:
 	void SetSeparator(char separator_);
 	char GetSeparator();
 
-	/// The typesep character is used for seperating the word from the type
-	void SetTypesep(char separator_);
-	char GetTypesep();
-
 	/// The list string contains a sequence of words separated by the separator character
 	void SetList(const char *list);
 

contrib/src/stc/scintilla/src/CallTip.cxx

@@ -18,9 +18,6 @@ CallTip::CallTip() {
 	inCallTipMode = false;
 	posStartCallTip = 0;
 	val = 0;
-	xUp = -100;
-	xDown = -100;
-	lineHeight = 1;
 	startHighlight = 0;
 	endHighlight = 0;
 
@@ -38,8 +35,6 @@ CallTip::~CallTip() {
 	val = 0;
 }
 
-const int widthArrow = 14;
-
 void CallTip::RefreshColourPalette(Palette &pal, bool want) {
 	pal.WantFind(colourBG, want);
 	pal.WantFind(colourUnSel, want);
@@ -48,98 +43,24 @@ void CallTip::RefreshColourPalette(Palette &pal, bool want) {
 	pal.WantFind(colourLight, want);
 }
 
-void CallTip::DrawChunk(Surface *surface, int &x, const char *s,
+void CallTip::PaintCT(Surface *surfaceWindow) {
-	int posStart, int posEnd, int ytext, PRectangle rcClient,
+	if (!val)
-	bool highlight, bool draw) {
+		return ;
-	s += posStart;
-	int len = posEnd - posStart;
-	int maxEnd = 0;
-	int ends[10];
-	for (int i=0;i<len;i++) {
-		if (s[i] <= '\002') {
-			if (i > 0)
-				ends[maxEnd++] = i;
-			ends[maxEnd++] = i+1;
-		}
-	}
-	ends[maxEnd++] = len;
-	int startSeg = 0;
-	int xEnd;
-	for (int seg = 0; seg<maxEnd; seg++) {
-		int endSeg = ends[seg];
-		if (endSeg > startSeg) {
-			if (s[startSeg] <= '\002') {
-				xEnd = x + widthArrow;
-				offsetMain = xEnd;
-				if (draw) {
-					const int halfWidth = widthArrow / 2 - 3;
-					const int centreX = x + widthArrow / 2 - 1;
-					const int centreY = (rcClient.top + rcClient.bottom) / 2;
-					rcClient.left = x;
-					rcClient.right = xEnd;
-					surface->FillRectangle(rcClient, colourBG.allocated);
-					PRectangle rcClientInner(rcClient.left+1, rcClient.top+1, rcClient.right-2, rcClient.bottom-1);
-					surface->FillRectangle(rcClientInner, colourUnSel.allocated);
-
-					if (s[startSeg] == '\001') {
-						// Up arrow
-						Point pts[] = {
-    						Point(centreX - halfWidth, centreY + halfWidth / 2),
-    						Point(centreX + halfWidth, centreY + halfWidth / 2),
-    						Point(centreX, centreY - halfWidth + halfWidth / 2),
-						};
-						surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 						colourBG.allocated, colourBG.allocated);
-					} else {
-						// Down arrow
-						Point pts[] = {
-    						Point(centreX - halfWidth, centreY - halfWidth / 2),
-    						Point(centreX + halfWidth, centreY - halfWidth / 2),
-    						Point(centreX, centreY + halfWidth - halfWidth / 2),
-						};
-						surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
-                 						colourBG.allocated, colourBG.allocated);
-					}
-				} else {
-					if (s[startSeg] == '\001') {
-						xUp = x+1;
-					} else {
-						xDown = x+1;
-					}
-				}
-			} else {
-				xEnd = x + surface->WidthText(font, s+startSeg, endSeg - startSeg);
-				if (draw) {
-					rcClient.left = x;
-					rcClient.right = xEnd;
-					surface->DrawTextNoClip(rcClient, font, ytext,
-										s+startSeg, endSeg - startSeg,
-										highlight ? colourSel.allocated : colourUnSel.allocated,
-										colourBG.allocated);
-				}
-			}
-			x = xEnd;
-			startSeg = endSeg;
-		}
-	}
-}
-
-int CallTip::PaintContents(Surface *surfaceWindow, bool draw) {
 	PRectangle rcClientPos = wCallTip.GetClientPosition();
 	PRectangle rcClientSize(0, 0, rcClientPos.right - rcClientPos.left,
 	                        rcClientPos.bottom - rcClientPos.top);
 	PRectangle rcClient(1, 1, rcClientSize.right - 1, rcClientSize.bottom - 1);
 
+	surfaceWindow->FillRectangle(rcClient, colourBG.allocated);
 	// To make a nice small call tip window, it is only sized to fit most normal characters without accents
+	int lineHeight = surfaceWindow->Height(font);
 	int ascent = surfaceWindow->Ascent(font) - surfaceWindow->InternalLeading(font);
 
 	// For each line...
 	// Draw the definition in three parts: before highlight, highlighted, after highlight
 	int ytext = rcClient.top + ascent + 1;
-	rcClient.bottom = ytext + surfaceWindow->Descent(font) + 1;
 	char *chunkVal = val;
 	bool moreChunks = true;
-	int maxWidth = 0;
 	while (moreChunks) {
 		char *chunkEnd = strchr(chunkVal, '\n');
 		if (chunkEnd == NULL) {
@@ -155,38 +76,36 @@ int CallTip::PaintContents(Surface *surfaceWindow, bool draw) {
 		int thisEndHighlight = Platform::Maximum(endHighlight, chunkOffset);
 		thisEndHighlight = Platform::Minimum(thisEndHighlight, chunkEndOffset);
 		thisEndHighlight -= chunkOffset;
-		rcClient.top = ytext - ascent - 1;
-
 		int x = 5;
+		int xEnd = x + surfaceWindow->WidthText(font, chunkVal, thisStartHighlight);
+		rcClient.left = x;
+		rcClient.top = ytext - ascent - 1;
+		rcClient.right = xEnd;
+		surfaceWindow->DrawTextNoClip(rcClient, font, ytext,
+		                        chunkVal, thisStartHighlight,
+		                        colourUnSel.allocated, colourBG.allocated);
+		x = xEnd;
 
-		DrawChunk(surfaceWindow, x, chunkVal, 0, thisStartHighlight,
+		xEnd = x + surfaceWindow->WidthText(font, chunkVal + thisStartHighlight,
-			ytext, rcClient, false, draw);
+		                                    thisEndHighlight - thisStartHighlight);
-		DrawChunk(surfaceWindow, x, chunkVal, thisStartHighlight, thisEndHighlight,
+		rcClient.top = ytext;
-			ytext, rcClient, true, draw);
+		rcClient.left = x;
-		DrawChunk(surfaceWindow, x, chunkVal, thisEndHighlight, chunkLength,
+		rcClient.right = xEnd;
-			ytext, rcClient, false, draw);
+		surfaceWindow->DrawTextNoClip(rcClient, font, ytext,
+		                        chunkVal + thisStartHighlight, thisEndHighlight - thisStartHighlight,
+		                        colourSel.allocated, colourBG.allocated);
+		x = xEnd;
 
+		xEnd = x + surfaceWindow->WidthText(font, chunkVal + thisEndHighlight,
+		                                    chunkLength - thisEndHighlight);
+		rcClient.left = x;
+		rcClient.right = xEnd;
+		surfaceWindow->DrawTextNoClip(rcClient, font, ytext,
+		                        chunkVal + thisEndHighlight, chunkLength - thisEndHighlight,
+		                        colourUnSel.allocated, colourBG.allocated);
 		chunkVal = chunkEnd + 1;
 		ytext += lineHeight;
-		rcClient.bottom += lineHeight;
-		maxWidth = Platform::Maximum(maxWidth, x);
 	}
-	return maxWidth;
-}
-
-void CallTip::PaintCT(Surface *surfaceWindow) {
-	if (!val)
-		return;
-	PRectangle rcClientPos = wCallTip.GetClientPosition();
-	PRectangle rcClientSize(0, 0, rcClientPos.right - rcClientPos.left,
-	                        rcClientPos.bottom - rcClientPos.top);
-	PRectangle rcClient(1, 1, rcClientSize.right - 1, rcClientSize.bottom - 1);
-
-	surfaceWindow->FillRectangle(rcClient, colourBG.allocated);
-
-	offsetMain = 5;
-	PaintContents(surfaceWindow, true);
-
 	// Draw a raised border around the edges of the window
 	surfaceWindow->MoveTo(0, rcClientSize.bottom - 1);
 	surfaceWindow->PenColour(colourShade.allocated);
@@ -197,34 +116,20 @@ void CallTip::PaintCT(Surface *surfaceWindow) {
 	surfaceWindow->LineTo(0, rcClientSize.bottom - 1);
 }
 
-void CallTip::MouseClick(Point pt) {
-	clickPlace = 0;
-	if (pt.y < lineHeight) {
-		if ((pt.x > xUp) && (pt.x < xUp + widthArrow - 2)) {
-			clickPlace = 1;
-		} else if ((pt.x > xDown) && (pt.x < xDown + widthArrow - 2)) {
-			clickPlace = 2;
-		}
-	}
-}
-
 PRectangle CallTip::CallTipStart(int pos, Point pt, const char *defn,
-                                 const char *faceName, int size,
+                                 const char *faceName, int size, bool unicodeMode_) {
-                                 int codePage_, Window &wParent) {
-	clickPlace = 0;
 	if (val)
 		delete []val;
 	val = new char[strlen(defn) + 1];
 	if (!val)
 		return PRectangle();
 	strcpy(val, defn);
-	codePage = codePage_;
+	unicodeMode = unicodeMode_;
 	Surface *surfaceMeasure = Surface::Allocate();
 	if (!surfaceMeasure)
 		return PRectangle();
-	surfaceMeasure->Init(wParent.GetID());
+	surfaceMeasure->Init();
-	surfaceMeasure->SetUnicodeMode(SC_CP_UTF8 == codePage);
+	surfaceMeasure->SetUnicodeMode(unicodeMode);
-	surfaceMeasure->SetDBCSMode(codePage);
 	startHighlight = 0;
 	endHighlight = 0;
 	inCallTipMode = true;
@@ -233,22 +138,23 @@ PRectangle CallTip::CallTipStart(int pos, Point pt, const char *defn,
 	font.Create(faceName, SC_CHARSET_DEFAULT, deviceHeight, false, false);
 	// Look for multiple lines in the text
 	// Only support \n here - simply means container must avoid \r!
+	int width = 0;
 	int numLines = 1;
 	const char *newline;
 	const char *look = val;
-	xUp = -100;
-	xDown = -100;
-	offsetMain = 5;
-	int width = PaintContents(surfaceMeasure, false) + 5;
 	while ((newline = strchr(look, '\n')) != NULL) {
+		int thisWidth = surfaceMeasure->WidthText(font, look, newline - look);
+		width = Platform::Maximum(width, thisWidth);
 		look = newline + 1;
 		numLines++;
 	}
-	lineHeight = surfaceMeasure->Height(font);
+	int lastWidth = surfaceMeasure->WidthText(font, look, static_cast<int>(strlen(look)));
+	width = Platform::Maximum(width, lastWidth) + 10;
+	int lineHeight = surfaceMeasure->Height(font);
 	// Extra line for border and an empty line at top and bottom
 	int height = lineHeight * numLines - surfaceMeasure->InternalLeading(font) + 2 + 2;
 	delete surfaceMeasure;
-	return PRectangle(pt.x - offsetMain, pt.y + 1, pt.x + width - offsetMain, pt.y + 1 + height);
+	return PRectangle(pt.x -5, pt.y + 1, pt.x + width - 5, pt.y + 1 + height);
 }
 
 void CallTip::CallTipCancel() {

contrib/src/stc/scintilla/src/CallTip.h

@@ -15,17 +15,9 @@ class CallTip {
 	int endHighlight;
 	char *val;
 	Font font;
-	int xUp;
-	int xDown;
-	int lineHeight;
-	int offsetMain;
 	// Private so CallTip objects can not be copied
 	CallTip(const CallTip &) {}
 	CallTip &operator=(const CallTip &) { return *this; }
-	void DrawChunk(Surface *surface, int &x, const char *s,
-		int posStart, int posEnd, int ytext, PRectangle rcClient,
-		bool highlight, bool draw);
-	int PaintContents(Surface *surfaceWindow, bool draw);
 
 public:
 	Window wCallTip;
@@ -37,25 +29,22 @@ public:
 	ColourPair colourSel;
 	ColourPair colourShade;
 	ColourPair colourLight;
-	int codePage;
+	bool unicodeMode;
-	int clickPlace;
+	
-
 	CallTip();
 	~CallTip();
-
+	
 	/// Claim or accept palette entries for the colours required to paint a calltip.
 	void RefreshColourPalette(Palette &pal, bool want);
-
+	
 	void PaintCT(Surface *surfaceWindow);
-
+	
-	void MouseClick(Point pt);
-
 	/// Setup the calltip and return a rectangle of the area required.
-	PRectangle CallTipStart(int pos, Point pt, const char *defn,
+	PRectangle CallTipStart(int pos, Point pt, const char *defn, 
-		const char *faceName, int size, int codePage_, Window &wParent);
+		const char *faceName, int size, bool unicodeMode_);
-
+		
 	void CallTipCancel();
-
+	
 	/// Set a range of characters to be displayed in a highlight style.
 	/// Commonly used to highlight the current parameter.
 	void SetHighlight(int start, int end);

contrib/src/stc/scintilla/src/CellBuffer.cxx

@@ -739,7 +739,6 @@ void CellBuffer::InsertCharStyle(int position, char ch, char style) {
 }
 
 bool CellBuffer::SetStyleAt(int position, char style, char mask) {
-	style &= mask;
 	char curVal = ByteAt(position * 2 + 1);
 	if ((curVal & mask) != style) {
 		SetByteAt(position*2 + 1, static_cast<char>((curVal & ~mask) | style));

contrib/src/stc/scintilla/src/CellBuffer.h

@@ -212,7 +212,7 @@ public:
 	int GetMark(int line);
 	void DeleteAllMarks(int markerNum);
 	int LineFromHandle(int markerHandle);
-
+ 
 	/// Actions without undo
 	void BasicInsertString(int position, char *s, int insertLength);
 	void BasicDeleteChars(int position, int deleteLength);