Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of http://github.com/etexteditor/e

  • Loading branch information...
commit ff9f584eb37eed5bedb3b4a91c035332621e79b6 2 parents c8c663e + 585646c
Vlad Ershov vershov authored
Showing with 5,487 additions and 450 deletions.
  1. BIN  ecore/ecore.lib
  2. BIN  ecore/ecored.lib
  3. BIN  ecore/libecore.so
  4. BIN  ecore/libecore64.so
  5. BIN  ecore/libecored.so
  6. BIN  ecore/libecored64.so
  7. +13 −6 external/build_externals_linux.sh
  8. +43 −26 external/get_externals_linux.sh
  9. +0 −15 external/patches/webkit/cancelledError.patch
  10. +14 −0 external/patches/webkit/fix_warning.patch
  11. +20 −0 external/patches/webkit/fix_wxwidgets_clash.diff
  12. +48 −85 external/patches/webkit/fully-static.patch
  13. +0 −11 external/patches/webkit/local_sec.patch
  14. +0 −122 external/patches/webkit/remove-targets.patch
  15. +0 −64 external/patches/webkit/vis_hidden.patch
  16. +5,206 −0 external/patches/webkit/webkit_688833_to_git_trunk.diff
  17. +0 −15 external/patches/webkit/wxtimerfix.patch
  18. +2 −2 src/ApiHandler.cpp
  19. +2 −0  src/BundleMenu.cpp
  20. +1 −1  src/Cell.cpp
  21. +1 −1  src/Cell.h
  22. +3 −1 src/CommandPanel.h
  23. +2 −2 src/DiffBar.cpp
  24. +12 −12 src/DiffDirPane.cpp
  25. +2 −1  src/DiffDirPane.h
  26. +4 −4 src/EditorCtrl.cpp
  27. +3 −3 src/EditorFrame.cpp
  28. +1 −0  src/Env.cpp
  29. +1 −1  src/FixedLine.cpp
  30. +2 −2 src/GotoFileDlg.cpp
  31. +3 −1 src/InputPanel.h
  32. +1 −1  src/Lines.cpp
  33. +1 −1  src/Lines.h
  34. +14 −14 src/Macro.h
  35. +7 −6 src/Makefile
  36. +2 −0  src/ProjectPane.cpp
  37. +12 −12 src/ProjectSettings.cpp
  38. +3 −3 src/RemoteProfileDlg.cpp
  39. +3 −4 src/SearchPanel.cpp
  40. +2 −2 src/Strings.cpp
  41. +3 −1 src/WebKitHtmlWnd.cpp
  42. +3 −2 src/WebKitHtmlWnd.h
  43. +1 −1  src/cx_pcre_internal.h
  44. +13 −0 src/cx_pcre_tables.cpp
  45. +1 −1  src/eApp.h
  46. +12 −12 src/eConnection.cpp
  47. +3 −3 src/eConnection.h
  48. +1 −1  src/eDocumentPath.cpp
  49. +2 −2 src/eServer.cpp
  50. +1 −1  src/hessian_ipc/connection.h
  51. +6 −1 src/hessian_ipc/hessian_values.cpp
  52. +2 −1  src/hessian_ipc/hessian_values.h
  53. +2 −2 src/hessian_ipc/hessian_writers.h
  54. +2 −2 src/hessian_ipc/proxy.h
  55. +2 −0  src/key_hook.h
  56. +3 −2 src/plistHandler.cpp
  57. +2 −0  src/webconnect/webframe.h
BIN  ecore/ecore.lib
View
Binary file not shown
BIN  ecore/ecored.lib
View
Binary file not shown
BIN  ecore/libecore.so
View
Binary file not shown
BIN  ecore/libecore64.so
View
Binary file not shown
BIN  ecore/libecored.so
View
Binary file not shown
BIN  ecore/libecored64.so
View
Binary file not shown
19 external/build_externals_linux.sh
View
@@ -1,16 +1,19 @@
#!/bin/bash
-if [ x"$1" == x"release" ] ; then
+variant=$1
+if [ x"$variant" == x"release" ] ; then
echo "Building release binaries"
output=`pwd`/out.release
cfg_switches=--disable-debug
+ webkit_output="Release"
tinyxml_switches="DEBUG=YES"
CPPFLAGS="-O2"
LDFLAGS="-g"
-elif [ x"$1" == x"debug" ] ; then
+elif [ x"$variant" == x"debug" ] ; then
echo "Building debug binaries"
output=`pwd`/out.debug
tinyxml_switches=
+ webkit_output="Debug"
cfg_switches=--enable-debug
CPPFLAGS="-O0 -g"
LDFLAGS="-g"
@@ -53,7 +56,7 @@ pushd pcre
make clean &&
make &&
make install &&
- cp config.h ucp.h $output/include ||
+ cp config.h ucp.h pcre_internal.h $output/include ||
( echo "Cannot compile pcre" ; exit 1 )
popd
@@ -97,10 +100,14 @@ popd
# wxwebkit
pushd webkit
-make clean
PATH="$output/bin:${PATH}" ./WebKitTools/Scripts/build-webkit --wx --wx-args=wxgc,ENABLE_OFFLINE_WEB_APPLICATIONS=0,ENABLE_DOM_STORAGE=1,ENABLE_DATABASE=0,ENABLE_ICONDATABASE=0,ENABLE_XPATH=1,ENABLE_XSLT=1,ENABLE_VIDEO=0,ENABLE_SVG=0,ENABLE_COVERAGE=0,ENABLE_WML=0,ENABLE_WORKERS=0 &&
- mv ./WebKitBuild/Release/*.a $output/lib &&
- cp ./WebKit/wx/*.h $output/include/wx-2.8/wx ||
+ mv ./WebKitBuild/${webkit_output}.*/*.a $output/lib &&
+ cp ./WebKit/wx/*.h $output/include/wx-2.8/wx &&
+ strip -g $output/lib/libwxwebkit.a ||
( echo "Cannot compile WebKit" ; exit 1 )
popd
+# boost
+pushd boost
+./bootstrap.sh && ./bjam link=static runtime-link=static variant=$variant --prefix=$output install
+popd
69 external/get_externals_linux.sh
View
@@ -2,19 +2,34 @@
#FIXME: refactor windows/linux code
+downloads=downloads
+
_download()
{
# Download external libraries
echo "Downloading external libraries..."
echo
- pushd arch
- wget -nc http://libtomcrypt.com/files/crypt-1.11.tar.bz2
- wget -nc http://math.libtomcrypt.com/files/ltm-0.39.tar.bz2
- wget -nc http://www.equi4.com/pub/mk/metakit-2.4.9.7.tar.gz
- wget -nc ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.9.tar.gz
- wget -nc http://kent.dl.sourceforge.net/sourceforge/tinyxml/tinyxml_2_5_3.tar.gz
- wget -nc http://biolpc22.york.ac.uk/pub/2.8.10/wxWidgets-2.8.10.tar.bz2
- wget -nc http://builds.nightly.webkit.org/files/trunk/src/WebKit-r43163.tar.bz2
+ pushd $downloads
+
+ # Only download files we don't already have.
+ # This lets us delete files to redownload, or get
+ # new versions automatically.
+
+ for url in \
+ http://github.com/ajpalkovic/e/raw/master/external/downloads/crypt-1.11.tar.bz2 \
+ http://github.com/ajpalkovic/e/raw/master/external/downloads/ltm-0.39.tar.bz2 \
+ http://www.equi4.com/pub/mk/metakit-2.4.9.7.tar.gz \
+ ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.9.tar.gz \
+ http://kent.dl.sourceforge.net/sourceforge/tinyxml/tinyxml_2_5_3.tar.gz \
+ http://biolpc22.york.ac.uk/pub/2.8.10/wxWidgets-2.8.10.tar.bz2 \
+ http://builds.nightly.webkit.org/files/trunk/src/WebKit-r68833.tar.bz2 \
+ http://downloads.sourceforge.net/project/boost/boost/1.44.0/boost_1_44_0.tar.gz
+ do
+ if [[ ! -e `basename $url` ]]; then
+ curl -O -L $url
+ fi
+ done
+
popd
}
@@ -23,11 +38,12 @@ _backup_existing_patches()
# Removing previous folders
tempdir=`mktemp -d back.XXXXXX` || exit 1
echo "Moving existing folders to $tempdir"
- mv libtomcrypt $tempdir/libtomcrypt
- mv libtommath $tempdir/libtommath
- mv metakit $tempdir/metakit
- mv pcre $tempdir/pcre
- mv tinyxml $tempdir/tinyxml
+ for dir in libtomcrypt libtommath metakit pcre tinyxml wxwidgets webkit boost
+ do
+ if [[ -e $dir ]]; then
+ mv $dir $tempdir/$dir;
+ fi
+ done
}
_extract_and_patch()
@@ -35,13 +51,14 @@ _extract_and_patch()
# Extract
echo "Extracting libraries.."
echo
- tar -xjf arch/crypt-*
- tar -xjf arch/ltm-*
- tar -xzf arch/metakit-*
- tar -xzf arch/pcre-*
- tar -xzf arch/tinyxml_*
- tar -xjf arch/wxWidgets-*
- tar -xjf arch/WebKit-*
+ tar -xjf $downloads/crypt-*
+ tar -xjf $downloads/ltm-*
+ tar -xzf $downloads/metakit-*
+ tar -xzf $downloads/pcre-*
+ tar -xzf $downloads/tinyxml_*
+ tar -xjf $downloads/wxWidgets-*
+ tar -xjf $downloads/WebKit-*
+ tar -xzf $downloads/boost_*
# Rename directories to generic names
echo "Renaming dirs..."
@@ -52,6 +69,7 @@ _extract_and_patch()
mv pcre-* pcre
mv wxWidgets-* wxwidgets
mv WebKit-* webkit
+ mv boost_* boost
# Apply patches
echo "Applying patches..."
@@ -64,11 +82,10 @@ _extract_and_patch()
echo "---- Applying wxwidget patches ----"
patch -Np1 -d wxwidgets < patches/wxWidgets-gsock.patch
echo "---- Applying webkit patches ----"
- patch -Np1 -d webkit < patches/webkit/remove-targets.patch
+ patch -Np1 -d webkit < patches/webkit/webkit_688833_to_git_trunk.diff
patch -Np1 -d webkit < patches/webkit/fully-static.patch
- patch -Np0 -d webkit < patches/webkit/vis_hidden.patch
- patch -Np1 -d webkit < patches/webkit/cancelledError.patch
- patch -Np1 -d webkit < patches/webkit/local_sec.patch
+ patch -Np1 -d webkit < patches/webkit/fix_warning.patch
+ patch -Np1 -d webkit < patches/webkit/fix_wxwidgets_clash.diff
}
_next_steps()
@@ -78,8 +95,8 @@ _next_steps()
}
-if [[ ! -e arch ]]; then
- mkdir arch
+if [[ ! -e $downloads ]]; then
+ mkdir $downloads
fi
if [[ "$1" != "repatch" ]]; then
15 external/patches/webkit/cancelledError.patch
View
@@ -1,15 +0,0 @@
---- WebKit/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp 2009-05-02 17:17:33.000000000 +0400
-+++ webkit/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp 2009-05-02 17:59:52.000000000 +0400
-@@ -559,10 +559,9 @@ void FrameLoaderClientWx::committedLoad(
- fl->addData(data, length);
- }
-
--WebCore::ResourceError FrameLoaderClientWx::cancelledError(const WebCore::ResourceRequest&)
-+WebCore::ResourceError FrameLoaderClientWx::cancelledError(const WebCore::ResourceRequest& request)
- {
-- notImplemented();
-- return ResourceError();
-+ return ResourceError("Error", -999, request.url().string(), "Load request cancelled");
- }
-
- WebCore::ResourceError FrameLoaderClientWx::blockedError(const ResourceRequest&)
14 external/patches/webkit/fix_warning.patch
View
@@ -0,0 +1,14 @@
+--- WebKit-r68833/WebKit/wx/WebView.h 2010-08-29 14:09:58.000000000 +0400
++++ webkit/WebKit/wx/WebView.h 2010-10-23 22:55:26.783000071 +0400
+@@ -60,9 +60,9 @@ class WXDLLIMPEXP_WEBKIT wxWebViewCacheP
+ {
+ public:
+ wxWebViewCachePolicy(unsigned minDead = 0, unsigned maxDead = defaultCacheCapacity, unsigned totalCapacity = defaultCacheCapacity)
+- : m_minDeadCapacity(minDead)
++ : m_capacity(totalCapacity)
++ , m_minDeadCapacity(minDead)
+ , m_maxDeadCapacity(maxDead)
+- , m_capacity(totalCapacity)
+ {}
+
+ ~wxWebViewCachePolicy() {}
20 external/patches/webkit/fix_wxwidgets_clash.diff
View
@@ -0,0 +1,20 @@
+--- webkit/WebCore/platform/wx/wxcode/gtk/scrollbar_render.cpp.orig 2010-10-24 01:49:03.999000077 +0400
++++ webkit/WebCore/platform/wx/wxcode/gtk/scrollbar_render.cpp 2010-10-24 01:49:20.773000078 +0400
+@@ -73,7 +73,7 @@ GtkWidget* GetButtonWidget()
+ }
+
+
+-GdkWindow* wxGetGdkWindowForDC(wxWindow* win, wxDC& dc)
++GdkWindow* wxWebKitGetGdkWindowForDC(wxWindow* win, wxDC& dc)
+ {
+ GdkWindow* gdk_window = NULL;
+ #if wxCHECK_VERSION(2, 9, 0)
+@@ -134,7 +134,7 @@ void wxRenderer_DrawScrollbar(wxWindow*
+ renderer.DrawPushButton(window, dc, wxRect(x,y,buttonLength,buttonLength), wxStyleForPart(wxSCROLLPART_BACKBTNSTART, focusPart, hoverPart, flags));
+
+ GtkWidget* button = GetButtonWidget();
+- GdkWindow* gdk_window = wxGetGdkWindowForDC(window, dc);
++ GdkWindow* gdk_window = wxWebKitGetGdkWindowForDC(window, dc);
+
+ GtkArrowType arrowType = GTK_ARROW_UP;
+ if (horiz)
133 external/patches/webkit/fully-static.patch
View
@@ -1,88 +1,51 @@
-diff -Naurp WebKit-r43110/WebKit/wx/wxwebkit.bkl webkit/WebKit/wx/wxwebkit.bkl
---- WebKit-r43110/WebKit/wx/wxwebkit.bkl 2009-05-01 08:15:10.000000000 +0400
-+++ webkit/WebKit/wx/wxwebkit.bkl 2009-05-02 12:40:46.000000000 +0400
-@@ -34,7 +34,7 @@ This file builds the wxWebKit library.
- <makefile>
- <include file="wxwk-settings.bkl"/>
-
-- <dll id="wxwebkit-dynamic" template="wxwk,jscore,webcore,xml2,iconv,xslt,icu,curl,sqlite3,gtk,pthreads">
-+ <lib id="wxwebkit-static" template="wxwk,jscore,webcore,xml2,iconv,xslt,icu,curl,sqlite3,gtk,pthreads">
- <!-- make sure we relink wxwebkit if either webcore or jscore change -->
- <if cond="FORMAT=='gnu'">
- <depends-on-file>$(WKOUTPUTDIR)/libjscore.a</depends-on-file>
-@@ -44,8 +44,6 @@ This file builds the wxWebKit library.
- <depends-on-file>$(WKOUTPUTDIR)/jscore.lib</depends-on-file>
- <depends-on-file>$(WKOUTPUTDIR)/webcore-wx.lib</depends-on-file>
- </if>
-- <runtime-libs>dynamic</runtime-libs>
-- <dllname>wxwebkit</dllname>
- <libname>wxwebkit</libname>
-
- <include>$(WK_ROOT)/WebCore/platform/graphics/wx</include>
-@@ -59,13 +57,6 @@ This file builds the wxWebKit library.
- <sys-lib>webcore-wx</sys-lib>
- <sys-lib>jscore</sys-lib>
-
-- <if cond="FORMAT in ['msvc','msvs2005prj']">
-- <sys-lib>winmm</sys-lib> <!-- for timeGetTime -->
-- <sys-lib>gdiplus</sys-lib>
-- <sys-lib>libpng</sys-lib>
-- <sys-lib>libjpeg</sys-lib>
-- </if>
--
- <sources>
- WebKitSupport/ChromeClientWx.cpp
- WebKitSupport/ContextMenuClientWx.cpp
-@@ -78,6 +69,6 @@ This file builds the wxWebKit library.
- WebView.cpp
- WebBrowserShell.cpp
- </sources>
-- </dll>
-+ </lib>
-
- </makefile>
-diff -Naurp WebKit-r43110/WebKit/wx/wxwk-settings.bkl webkit/WebKit/wx/wxwk-settings.bkl
---- WebKit-r43110/WebKit/wx/wxwk-settings.bkl 2009-04-30 04:34:15.000000000 +0400
-+++ webkit/WebKit/wx/wxwk-settings.bkl 2009-05-02 12:40:46.000000000 +0400
-@@ -31,7 +31,7 @@ JavaScriptCore Bakefile project file.
-
- <makefile>
- <set var="WX_UNICODE">1</set>
-- <set var="WX_SHARED">1</set>
-+ <set var="WX_SHARED">0</set>
+--- WebKit-r68833/WebKit/wx/wscript 2010-07-29 04:31:09.000000000 +0400
++++ webkit/WebKit/wx/wscript 2010-10-23 20:47:42.779000070 +0400
+@@ -98,7 +98,7 @@ def build(bld):
+ bld.env.LIBDIR = output_dir
- <include file="presets/wx.bkl"/>
- <include file="presets/wxwebkit.bkl"/>
-@@ -99,8 +99,6 @@ JavaScriptCore Bakefile project file.
- </if>
- </set>
- <sys-lib>$(WEBCORE_LIBS)</sys-lib>
-- <wx-lib>core</wx-lib>
-- <wx-lib>base</wx-lib>
- <if cond="PLATFORM_WIN32=='1'">
- <define>WXUSINGDLL=1</define>
- </if>
-diff -Naurp WebKit-r43110/WebCore/webcore-base.bkl webkit/WebCore/webcore-base.bkl
---- WebKit-r43110/WebCore/webcore-base.bkl 2009-04-30 04:04:21.000000000 +0400
-+++ webkit/WebCore/webcore-base.bkl 2009-05-02 12:40:46.000000000 +0400
-@@ -60,7 +60,7 @@ wxWebCore port Bakefile project file.
- $(WEBCORE_SOURCES_JPEG)
- </set>
+ obj = bld.new_task_gen(
+- features = 'cxx cshlib implib',
++ features = 'cxx cstaticlib implib',
+ includes = ' '.join(include_paths + js_include_dirs),
+ target = 'wxwebkit',
+ defines = ['WXMAKINGDLL_WEBKIT'],
+--- WebKit-r68833/JavaScriptCore/wscript 2010-10-01 01:57:41.000000000 +0400
++++ webkit/JavaScriptCore/wscript 2010-10-23 21:59:07.018000070 +0400
+@@ -65,20 +65,4 @@ def build(bld):
-- <template id="webcore_base" template="xml2,iconv,xslt,icu,jscore,curl,sqlite3">
-+ <template id="webcore_base" template="jscore,xslt,xml2,sqlite3,iconv,icu,curl">
- <include>$(SRCDIR)</include>
- <include>$(SRCDIR)/bindings/js</include>
- <include>$(SRCDIR)/bridge</include>
-diff -Naurp WebKit-r43110/WebCore/webcore-wx.bkl webkit/WebCore/webcore-wx.bkl
---- WebKit-r43110/WebCore/webcore-wx.bkl 2009-04-30 04:34:15.000000000 +0400
-+++ webkit/WebCore/webcore-wx.bkl 2009-05-02 12:40:46.000000000 +0400
-@@ -34,7 +34,7 @@ wxWebCore port Bakefile project file.
- <makefile>
- <include file="webcore-base.bkl"/>
+ jscore.find_sources_in_dirs(full_dirs, excludes = jscore_excludes)
+
+- obj = bld.new_task_gen(
+- features = 'cxx cprogram',
+- includes = '. .. assembler DerivedSources ForwardingHeaders ' + ' '.join(includes),
+- source = 'jsc.cpp',
+- target = 'jsc',
+- uselib = 'WX ICU ' + get_config(),
+- uselib_local = 'jscore',
+- install_path = output_dir,
+- )
+-
+- if building_on_win32:
+- myenv = obj.env.copy()
+- myenv.CXXFLAGS = myenv.CXXFLAGS[:]
+- myenv.CXXFLAGS.remove('/EHsc')
+- obj.env = myenv
+-
+ bld.install_files(os.path.join(output_dir, 'JavaScriptCore'), 'API/*.h')
+--- WebKit-r68833/wscript 2010-10-01 01:57:42.000000000 +0400
++++ webkit/wscript 2010-10-23 22:19:56.455000071 +0400
+@@ -233,7 +233,7 @@ def build(bld):
+ cxxflags.extend(['-include', 'WebCorePrefix.h'])
-- <template id="webcore-wx" template="wxwk_build_settings,webcore_base,curl,gtk,pthreads">
-+ <template id="webcore-wx" template="webcore_base,wxwk_build_settings,curl,gtk,pthreads">
- <pic>on</pic>
- <threading>multi</threading>
-
+ webcore = bld.new_task_gen(
+- features = 'cc cxx cshlib',
++ features = 'cc cxx cstaticlib',
+ includes = ' '.join(wk_includes),
+ source = ' '.join(flattenSources(webcore_sources.values())),
+ cxxflags = cxxflags,
+@@ -324,4 +324,4 @@ def build(bld):
+ bld.add_group()
+
+ if build_port == "wx":
+- bld.add_subdirs(['WebKitTools/DumpRenderTree', 'WebKitTools/wx/browser', 'WebKit/wx/bindings/python'])
++ bld.add_subdirs(['WebKit/wx/bindings/python', ])
11 external/patches/webkit/local_sec.patch
View
@@ -1,11 +0,0 @@
---- WebKit/WebCore/loader/FrameLoader.cpp 2009-05-05 17:39:56.000000000 +0400
-+++ webkit/WebCore/loader/FrameLoader.cpp 2009-05-05 17:40:23.000000000 +0400
-@@ -5181,7 +5181,7 @@ bool FrameLoader::shouldTreatURLSchemeAs
- }
-
- if (scheme.isEmpty())
-- return false;
-+ return true;
-
- return localSchemes().contains(scheme);
- }
122 external/patches/webkit/remove-targets.patch
View
@@ -1,122 +0,0 @@
-diff -Naurp WebKit-r43110/JavaScriptCore/jscore.bkl webkit/JavaScriptCore/jscore.bkl
---- WebKit-r43110/JavaScriptCore/jscore.bkl 2009-04-30 23:01:27.000000000 +0400
-+++ webkit/JavaScriptCore/jscore.bkl 2009-05-02 12:40:13.000000000 +0400
-@@ -105,40 +105,6 @@ JavaScriptCore Bakefile project file.
-
- </template>
-
-- <exe id="jsc" template="icu,jscore,pthreads,wxwk">
-- <cxx-rtti>off</cxx-rtti>
-- <cxx-exceptions>off</cxx-exceptions>
-- <debug-info>on</debug-info>
-- <depends>jscore</depends>
-- <include>$(SRCDIR)</include>
-- <include>$(WK_ROOT)/JavaScriptCore</include>
-- <include>$(WK_ROOT)/JavaScriptCore/assembler</include>
-- <include>$(WK_ROOT)/JavaScriptCore/bytecompiler</include>
-- <include>$(WK_ROOT)/JavaScriptCore/debugger</include>
-- <include>$(WK_ROOT)/JavaScriptCore/parser</include>
-- <include>$(WK_ROOT)/JavaScriptCore/pcre</include>
-- <include>$(WK_ROOT)/JavaScriptCore/profiler</include>
-- <include>$(WK_ROOT)/JavaScriptCore/runtime</include>
-- <include>$(WK_ROOT)/JavaScriptCore/interpreter</include>
-- <include>$(WK_ROOT)/JavaScriptCore/bytecode</include>
-- <include>$(WK_ROOT)/JavaScriptCore/jit</include>
-- <include>$(WK_ROOT)/JavaScriptCore/wrec</include>
-- <include>$(WK_ROOT)/JavaScriptCore/wtf</include>
-- <dirname>$(WKOUTPUTDIR)</dirname>
-- <sources>$(SRCDIR)/jsc.cpp</sources>
-- <set var="READLINE_LIB">
-- <if cond="WX_PORT=='mac'">edit</if>
-- </set>
-- <sys-lib>$(READLINE_LIB)</sys-lib>
-- <if cond="FORMAT in ['msvc','msvs2005prj']">
-- <include>$(WK_ROOT)/WebKitLibraries/win/include</include>
-- <sys-lib>winmm</sys-lib> <!-- for timeGetTime -->
-- <lib-path>$(WKOUTPUTDIR)</lib-path>
-- <lib-path>$(WK_ROOT)/WebKitLibraries/win/lib</lib-path>
-- </if>
--
-- </exe>
--
- <action id="DerivedSources">
- <is-phony />
- <command>bash make-generated-sources.sh</command>
-diff -Naurp WebKit-r43110/WebKit/wx/Bakefiles.bkgen webkit/WebKit/wx/Bakefiles.bkgen
---- WebKit-r43110/WebKit/wx/Bakefiles.bkgen 2009-04-30 04:04:21.000000000 +0400
-+++ webkit/WebKit/wx/Bakefiles.bkgen 2009-05-02 12:38:57.000000000 +0400
-@@ -41,19 +41,13 @@ Build configuration script for Bakefile.
-
- <!-- List of output formats to generate: -->
- <add-formats>
-- gnu,msvs2005prj,msvc
-+ gnu
- </add-formats>
-
- <!-- JSCore settings -->
- <add-flags files="../../JavaScriptCore/jscore.bkl" formats="gnu">
- -o../../JavaScriptCore/GNUmakefile
- </add-flags>
-- <add-flags files="../../JavaScriptCore/jscore.bkl" formats="msvs2005prj">
-- -o../../JavaScriptCore/JavaScriptCore.sln
-- </add-flags>
-- <add-flags files="../../JavaScriptCore/jscore.bkl" formats="msvc">
-- -o../../JavaScriptCore/makefile.vc
-- </add-flags>
- <!-- testing XCode backend
- <add-flags files="jscore.bkl" formats="xcode2">
- -o../WebCore/Projects/base/WebCoreBase.xcode
-@@ -64,42 +58,18 @@ Build configuration script for Bakefile.
- <add-flags files="../../WebCore/webcore-wx.bkl" formats="gnu">
- -o../../WebCore/GNUmakefile
- </add-flags>
-- <add-flags files="../../WebCore/webcore-wx.bkl" formats="msvs2005prj">
-- -o../../WebCore/webcore-wx.sln
-- </add-flags>
-- <add-flags files="../../WebCore/webcore-wx.bkl" formats="msvc">
-- -o../../WebCore/makefile.vc
-- </add-flags>
-
- <add-flags files="wxwebkit.bkl" formats="gnu">
- -oGNUmakefile
- </add-flags>
-- <add-flags files="wxwebkit.bkl" formats="msvs2005prj">
-- -owxWebKit.sln
-- </add-flags>
-- <add-flags files="wxwebkit.bkl" formats="msvc">
-- -omakefile.vc
-- </add-flags>
-
- <add-flags files="bindings/python/wxwebkit-py.bkl" formats="gnu">
- -obindings/python/GNUmakefile
- </add-flags>
-- <add-flags files="bindings/python/wxwebkit-py.bkl" formats="msvs2005prj">
-- -obindings/python/wxWebKit.sln
-- </add-flags>
-- <add-flags files="bindings/python/wxwebkit-py.bkl" formats="msvc">
-- -obindings/python/makefile.vc
-- </add-flags>
-
- <add-flags files="../../WebKitTools/wx/browser/browser.bkl" formats="gnu">
- -o../../WebKitTools/wx/browser/GNUmakefile
- </add-flags>
-- <add-flags files="../../WebKitTools/wx/browser/browser.bkl" formats="msvs2005prj">
-- -o../../WebKitTools/wx/browser/browser.sln
-- </add-flags>
-- <add-flags files="../../WebKitTools/wx/browser/browser.bkl" formats="msvc">
-- -o../../WebKitTools/wx/browser/makefile.vc
-- </add-flags>
- <!-- testing XCode backend
- <add-flags files="webcore-wx.bkl" formats="xcode2">
- -o../WebCore/Projects/wx/wxWebCore.xcode
-diff -Naurp WebKit-r43110/WebKitTools/wx/build-wxwebkit webkit/WebKitTools/wx/build-wxwebkit
---- WebKit-r43110/WebKitTools/wx/build-wxwebkit 2009-05-01 08:15:10.000000000 +0400
-+++ webkit/WebKitTools/wx/build-wxwebkit 2009-05-02 12:38:57.000000000 +0400
-@@ -302,7 +302,6 @@ if [ $do_build == 1 -o $do_clean == 1 ];
-
- do_make $WK_ROOT/WebCore "-DBUILDING_WX__=1 $WXGC_DEFINE $EXTRA_CPPFLAGS" WX_DEBUG=$wxdebug WEBKIT_ROOT=$WK_ROOTDIR DEBUG=$debug PLATFORM_OS=$PLATFORM_OS $other_args
- do_make $WK_ROOT/WebKit/wx "-DBUILDING_WX__=1 -DWXMAKINGDLL_WEBKIT=1 $WXGC_DEFINE $EXTRA_CPPFLAGS" WX_DEBUG=$wxdebug DEBUG=$debug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
-- do_make $WK_ROOT/WebKitTools/wx/browser "-DBUILDING_WX__=1 -DWXUSINGDLL_WEBKIT=1 $WXGC_DEFINE $EXTRA_CPPFLAGS" WX_DEBUG=$wxdebug DEBUG=$debug WEBKIT_ROOT=$WK_ROOTDIR PLATFORM_OS=$PLATFORM_OS $other_args
-
- if [ $do_clean == 1 ]; then
- rm -rf $WK_ROOT/JavaScriptCore/DerivedSources
64 external/patches/webkit/vis_hidden.patch
View
@@ -1,64 +0,0 @@
-From bug 24345
-
-
-Index: WebKit/wx/WebFrame.h
-===================================================================
---- WebKit/wx/WebFrame.h (revision 41418)
-+++ WebKit/wx/WebFrame.h (working copy)
-@@ -46,6 +46,9 @@
-
- #ifndef SWIG
-
-+#if !wxCHECK_VERSION(2,9,0) && wxCHECK_GCC_VERSION(4,0)
-+#define WXDLLIMPEXP_WEBKIT __attribute__ ((visibility("default")))
-+#else
- #if WXMAKINGDLL_WEBKIT
- #define WXDLLIMPEXP_WEBKIT WXEXPORT
- #elif defined(WXUSINGDLL_WEBKIT)
-@@ -54,8 +57,7 @@
- #define WXDLLIMPEXP_WEBKIT
- #endif
-
--#else
--#define WXDLLIMPEXP_WEBKIT
-+#endif
- #endif // SWIG
-
- class WXDLLIMPEXP_WEBKIT wxWebViewDOMElementInfo
-Index: WebKit/wx/WebView.h
-===================================================================
---- WebKit/wx/WebView.h (revision 41418)
-+++ WebKit/wx/WebView.h (working copy)
-@@ -46,6 +46,9 @@
-
- #ifndef SWIG
-
-+#if !wxCHECK_VERSION(2,9,0) && wxCHECK_GCC_VERSION(4,0)
-+#define WXDLLIMPEXP_WEBKIT __attribute__ ((visibility("default")))
-+#else
- #if WXMAKINGDLL_WEBKIT
- #define WXDLLIMPEXP_WEBKIT WXEXPORT
- #elif defined(WXUSINGDLL_WEBKIT)
-@@ -54,8 +57,7 @@
- #define WXDLLIMPEXP_WEBKIT
- #endif
-
--#else
--#define WXDLLIMPEXP_WEBKIT
-+#endif
- #endif // SWIG
-
- #ifndef SWIG
-Index: WebKitTools/wx/build-wxwebkit
-===================================================================
---- WebKitTools/wx/build-wxwebkit (revision 41418)
-+++ WebKitTools/wx/build-wxwebkit (working copy)
-@@ -179,7 +179,7 @@
- cd $olddir
- else
- if [ -f $dir/GNUmakefile ]; then
-- make -C $dir -f GNUmakefile $MAKE_ARGS CXXFLAGS="$cxxflags" $@
-+ make -C $dir -f GNUmakefile $MAKE_ARGS CXXFLAGS="$cxxflags -fvisibility=hidden -fvisibility-inlines-hidden" $@
- fi
- fi
- if [ $? != 0 ]; then
5,206 external/patches/webkit/webkit_688833_to_git_trunk.diff
View
5,206 additions, 0 deletions not shown
15 external/patches/webkit/wxtimerfix.patch
View
@@ -1,15 +0,0 @@
---- WebKit/WebCore/platform/wx/SharedTimerWx.cpp 2009-05-05 03:17:51.000000000 +0400
-+++ webkit/WebCore/platform/wx/SharedTimerWx.cpp 2009-05-05 03:19:07.000000000 +0400
-@@ -77,11 +77,7 @@ void setSharedTimerFireTime(double fireT
- if (!wkTimer)
- wkTimer = new WebKitTimer();
-
-- unsigned int intervalInMS = interval * 1000;
--
-- // sanity check
-- if (intervalInMS < 1)
-- intervalInMS = 1;
-+ unsigned int intervalInMS = interval < 0.0012 ? 1 : interval * 1000;
-
- wkTimer->Start(intervalInMS, wxTIMER_ONE_SHOT);
- }
4 src/ApiHandler.cpp
View
@@ -77,7 +77,7 @@ void ApiHandler::OnIpcCall(wxCommandEvent& event) {
const string& m = call->GetMethod();
const wxString method(m.c_str(), wxConvUTF8, m.size());
- wxLogDebug(wxT("IPC: %s"), method);
+ wxLogDebug(wxT("IPC: %s"), method.c_str());
// Call the function (if it exists)
bool methodFound = true;
@@ -194,7 +194,7 @@ void ApiHandler::OnIpcClosed(wxCommandEvent& event) {
// Remove all notifiers from closed connection
map<unsigned int, IConnection*>::iterator p = m_notifiers.begin();
while (p != m_notifiers.end()) {
- if (p->second == conn) p = m_notifiers.erase(p);
+ if (p->second == conn) m_notifiers.erase(p++);
else ++p;
}
2  src/BundleMenu.cpp
View
@@ -15,7 +15,9 @@
#include "tmAction.h"
#ifdef __WXGTK__
+#define GSocket GlibGSocket
#include <gtk/gtk.h>
+#undef GSocket
void BundleMenuItem::AfterInsert(void) {
GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
2  src/Cell.cpp
View
@@ -20,7 +20,7 @@ void Cell::Destroy() {
delete this;
}
-const int Cell::GetWidth() {
+int Cell::GetWidth() {
return width;
}
2  src/Cell.h
View
@@ -28,7 +28,7 @@ class Cell {
explicit Cell(const wxDC& dc);
virtual ~Cell() {};
virtual void Destroy();
- const int GetWidth();
+ int GetWidth();
void SetStyle(const wxColour& fc, const wxColour& bc);
virtual void DrawCell(int xoffset, int yoffset, const wxRect& rect)=0;
4 src/CommandPanel.h
View
@@ -17,6 +17,8 @@
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include <wx/panel.h>
+#include <wx/textctrl.h>
+#include <wx/stattext.h>
#include <wx/string.h>
#endif
@@ -46,4 +48,4 @@ class CommandPanel : public wxPanel {
size_t m_selectionCount;
};
-#endif //__COMMANDPANEL_H__
+#endif //__COMMANDPANEL_H__
4 src/DiffBar.cpp
View
@@ -299,7 +299,7 @@ void DiffBar::OnMouseMotion(wxMouseEvent& evt) {
const unsigned int rightBracket = size.x - s_bracketWidth;
int highlight = -1;
- if (mpos.x <= s_bracketWidth) {
+ if (mpos.x <= (int)s_bracketWidth) {
std::vector<LineMatch>::const_iterator p = OnLeftBracket(mpos.y);
if( p != m_lineMatches.end()) highlight = p->left_start;
}
@@ -318,7 +318,7 @@ void DiffBar::OnMouseLeftUp(wxMouseEvent& evt) {
const wxSize size = GetClientSize();
const wxPoint mpos = evt.GetPosition();
- if (mpos.x <= s_bracketWidth) {
+ if (mpos.x <= (int)s_bracketWidth) {
// Have we clicked a bracket?
std::vector<LineMatch>::const_iterator p = OnLeftBracket(mpos.y);
if (p == m_lineMatches.end()) return;
24 src/DiffDirPane.cpp
View
@@ -32,18 +32,18 @@ enum {
WX_DECLARE_STRING_HASH_MAP( wxTreeItemId, NameToTreeIdHash );
BEGIN_EVENT_TABLE(DiffDirPane, wxPanel)
- EVT_TREE_ITEM_GETTOOLTIP(ID_DIFFTREE, OnTreeGetToolTip)
- EVT_TREE_ITEM_MENU(ID_DIFFTREE, OnTreeMenu)
- EVT_TREE_ITEM_ACTIVATED(ID_DIFFTREE, OnTreeActivated)
- EVT_TREE_ITEM_EXPANDING(ID_DIFFTREE, OnTreeExpanding)
- EVT_MENU(ID_MENU_COMPARE, OnMenuCompare)
- EVT_MENU(ID_MENU_OPEN, OnMenuOpen)
- EVT_MENU(ID_MENU_OPENLEFT, OnMenuOpenLeft)
- EVT_MENU(ID_MENU_OPENRIGHT, OnMenuOpenRight)
- EVT_MENU(ID_MENU_COPYLEFT, OnMenuCopyToLeft)
- EVT_MENU(ID_MENU_COPYRIGHT, OnMenuCopyToRight)
- EVT_MENU(ID_MENU_DELLEFT, OnMenuDelLeft)
- EVT_MENU(ID_MENU_DELRIGHT, OnMenuDelRight)
+ EVT_TREE_ITEM_GETTOOLTIP(ID_DIFFTREE, DiffDirPane::OnTreeGetToolTip)
+ EVT_TREE_ITEM_MENU(ID_DIFFTREE, DiffDirPane::OnTreeMenu)
+ EVT_TREE_ITEM_ACTIVATED(ID_DIFFTREE, DiffDirPane::OnTreeActivated)
+ EVT_TREE_ITEM_EXPANDING(ID_DIFFTREE, DiffDirPane::OnTreeExpanding)
+ EVT_MENU(ID_MENU_COMPARE, DiffDirPane::OnMenuCompare)
+ EVT_MENU(ID_MENU_OPEN, DiffDirPane::OnMenuOpen)
+ EVT_MENU(ID_MENU_OPENLEFT, DiffDirPane::OnMenuOpenLeft)
+ EVT_MENU(ID_MENU_OPENRIGHT, DiffDirPane::OnMenuOpenRight)
+ EVT_MENU(ID_MENU_COPYLEFT, DiffDirPane::OnMenuCopyToLeft)
+ EVT_MENU(ID_MENU_COPYRIGHT, DiffDirPane::OnMenuCopyToRight)
+ EVT_MENU(ID_MENU_DELLEFT, DiffDirPane::OnMenuDelLeft)
+ EVT_MENU(ID_MENU_DELRIGHT, DiffDirPane::OnMenuDelRight)
END_EVENT_TABLE()
DiffDirPane::DiffDirPane(EditorFrame& parent)
3  src/DiffDirPane.h
View
@@ -19,6 +19,7 @@
#include <wx/wx.h>
#endif
#include <wx/treectrl.h>
+#include <wx/imaglist.h>
WX_DECLARE_STRING_HASH_MAP( int, IconHash );
@@ -81,4 +82,4 @@ class DiffDirPane : public wxPanel {
wxTreeItemId m_menuItem;
};
-#endif //__DIFFDIRPANE_H__
+#endif //__DIFFDIRPANE_H__
8 src/EditorCtrl.cpp
View
@@ -332,7 +332,7 @@ void EditorCtrl::RestoreSettings(unsigned int page_id, eFrameSettings& settings,
vector<unsigned int> bookmarks;
// Retrieve the page info
- wxASSERT(0 <= page_id && page_id < (int)settings.GetPageCount());
+ wxASSERT(0 <= page_id && page_id < settings.GetPageCount());
settings.GetPageSettings(page_id, mirrorPath, di, newpos, topline, syntax, folds, bookmarks, (SubPage)subid);
if (eDocumentPath::IsRemotePath(mirrorPath)) {
@@ -2870,7 +2870,7 @@ bool EditorCtrl::SaveText(bool askforpath) {
if (askforpath || newpath.empty()) {
wxFileDialog dlg(this, _T("Save as..."), _T(""), _T(""), EditorFrame::DefaultFileFilters, wxSAVE|wxCHANGE_DIR);
- dlg.SetPath( newpath.empty() ? _("Untitled") : newpath );
+ dlg.SetPath( newpath.empty() ? wxString(_("Untitled")) : newpath );
dlg.Centre();
if (dlg.ShowModal() != wxID_OK) return false;
@@ -3472,7 +3472,7 @@ void EditorCtrl::DeleteSelections() {
interval& r = m_searchRanges[i];
if (end <= r.end) {
// Adjust cursor
- size_t& c = m_cursors[i];
+ unsigned int& c = m_cursors[i];
if (c == end) c = start;
else if (c > end) c -= len;
@@ -9987,7 +9987,7 @@ wxVariant EditorCtrl::PlayCommand(const eMacroCmd& cmd) {
m_syntaxHandler.DoBundleAction(uuid, *this);
}
- else return wxVariant(NULL, wxT("Unknown method"));
+ else return wxVariant((wxVariantData*)NULL, wxT("Unknown method"));
return wxVariant();
}
6 src/EditorFrame.cpp
View
@@ -2989,7 +2989,7 @@ void EditorFrame::UpdateRecentFiles() {
for (unsigned int i = 0; i < m_recentFiles.GetCount(); i++) {
wxString filename = m_recentFiles[i];
if (i < 9)
- filename = wxString::Format(wxT("&%d %s"), i+1, filename);
+ filename = wxString::Format(wxT("&%d %s"), i+1, filename.c_str());
m_recentFilesMenu->Append(4000 + i, filename);
}
@@ -3000,7 +3000,7 @@ void EditorFrame::UpdateRecentFiles() {
for (unsigned int i = 0; i < m_recentProjects.GetCount(); i++) {
wxString filename = m_recentProjects[i];
if (i < 9)
- filename = wxString::Format(wxT("&%d %s"), i+1, filename);
+ filename = wxString::Format(wxT("&%d %s"), i+1, filename.c_str());
m_recentProjectsMenu->Append(4100 + i, filename);
}
@@ -3909,7 +3909,7 @@ void EditorFrame::OnDocChange(EditorFrame* self, void* data, int WXUNUSED(filter
void EditorFrame::OnOpenDoc(EditorFrame* self, void* data, int WXUNUSED(filter)) {
if (!self->editorCtrl) return;
- const uintptr_t docId = (uintptr_t)data;
+ const wxUIntPtr docId = (wxUIntPtr)data;
const doc_id di(DOCUMENT, docId, 0);
// If current doc is same just keep it
1  src/Env.cpp
View
@@ -4,6 +4,7 @@
#include <wx/filename.h>
#include <wx/file.h>
+#include <wx/utils.h>
void cxEnv::SetEnv(const wxString& key, const wxString& value) {
wxASSERT(!key.empty());
2  src/FixedLine.cpp
View
@@ -33,10 +33,10 @@ FixedLine::FixedLine(wxDC& dc, const DocumentWrapper& dw, const vector<interval>
m_tabChars(4),
lastpos(lastpos),
m_isSelShadow(isShadow),
- selections(sel),
m_brackets(brackets),
m_theme(theme),
m_sr(m_theme, (FastDC&)dc),
+ selections(sel),
m_wrapMode(cxWRAP_NONE),
m_showIndent(false),
m_indentWidth(0),
4 src/GotoFileDlg.cpp
View
@@ -44,8 +44,8 @@ class DirState {
}
DirState(const wxString& path):
- walkingFiles(false),
- prefix(path + wxFILE_SEP_PATH)
+ prefix(path + wxFILE_SEP_PATH),
+ walkingFiles(false)
{
dir.Open(path);
}
4 src/InputPanel.h
View
@@ -17,6 +17,8 @@
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include <wx/panel.h>
+#include <wx/textctrl.h>
+#include <wx/stattext.h>
#include <wx/string.h>
#endif
@@ -47,4 +49,4 @@ class InputPanel : public wxPanel {
unsigned int m_notifier_id;
};
-#endif //__INPUTPANEL_H
+#endif //__INPUTPANEL_H
2  src/Lines.cpp
View
@@ -674,7 +674,7 @@ void Lines::RemoveAllSelections(bool checkShadow, unsigned int pos) {
}
const vector<interval>& Lines::GetSelections() const { return selections; }
-const interval* const Lines::FirstSelection() const { return selections.empty() ? NULL : &(selections[0]); }
+const interval* Lines::FirstSelection() const { return selections.empty() ? NULL : &(selections[0]); }
void Lines::Clear() {
ll->clear();
2  src/Lines.h
View
@@ -108,7 +108,7 @@ class Lines: public ILinePositions {
int AddSelection(unsigned int start, unsigned int end);
int UpdateSelection(unsigned int sel_id, unsigned int start, unsigned int end);
const std::vector<interval>& GetSelections() const;
- const interval* const FirstSelection() const;
+ const interval* FirstSelection() const;
void ShadowSelections(bool isShadow=true) {m_isSelShadow = isShadow;};
void RemoveAllSelections(bool checkShadow=false, unsigned int pos=0);
void RemoveSelection(unsigned int sel_id);
28 src/Macro.h
View
@@ -46,29 +46,29 @@ class eMacroCmd {
const wxString& GetName() const {return m_cmd;};
size_t GetArgCount() const {return m_args.size();};
- const wxString& GetArgName(size_t ndx) const {return (ndx < m_argNames.size()) ? m_argNames[ndx] : wxEmptyString;};
+ const wxString& GetArgName(size_t ndx) const {return (ndx < m_argNames.size()) ? m_argNames[ndx] : wxGetEmptyString();};
const wxVariant& GetArg(size_t ndx) const {return m_args[ndx];};
wxVariant& GetArg(size_t ndx) {return m_args[ndx];};
const std::vector<wxVariant>& GetArgs() const {return m_args;};
- bool GetArgBool(size_t ndx, bool default=false) const {
- if (ndx >= m_args.size()) return default;
+ bool GetArgBool(size_t ndx, bool dflt=false) const {
+ if (ndx >= m_args.size()) return dflt;
const wxVariant& value = m_args[ndx];
- if (!value.IsType(_("bool"))) return default;
+ if (!value.IsType(_("bool"))) return dflt;
return value.GetBool();
}
- int GetArgInt(size_t ndx, int default=0) const {
- if (ndx >= m_args.size()) return default;
+ int GetArgInt(size_t ndx, int dflt=0) const {
+ if (ndx >= m_args.size()) return dflt;
const wxVariant& value = m_args[ndx];
- if (!value.IsType(_("long"))) return default;
+ if (!value.IsType(_("long"))) return dflt;
return value.GetLong();
}
- wxString GetArgString(size_t ndx, const wxString& default=wxEmptyString) const {
- if (ndx >= m_args.size()) return default;
+ wxString GetArgString(size_t ndx, const wxString& dflt=wxEmptyString) const {
+ if (ndx >= m_args.size()) return dflt;
const wxVariant& value = m_args[ndx];
- if (!value.IsType(_("string"))) return default;
+ if (!value.IsType(_("string"))) return dflt;
return value.GetString();
}
@@ -122,18 +122,18 @@ class eMacro {
const eMacroCmd& GetCommand(size_t ndx) const {return m_cmds[ndx];};
eMacroCmd& GetCommand(size_t ndx) {m_isModified = true; return m_cmds[ndx];};
- const eMacroCmd& Last() const {m_cmds.back();};
+ void Last() const {m_cmds.back();};
eMacroCmd& Last() {m_isModified = true; return m_cmds.back();};
eMacroCmd& Add(const wxString& cmd) {
- wxLogDebug(wxT("Adding macro: %s"), cmd);
+ wxLogDebug(wxT("Adding macro: %s"), cmd.c_str());
m_cmds.push_back(new eMacroCmd(cmd));
m_isModified = true;
return m_cmds.back();
};
template<class T> eMacroCmd& Add(const wxString& cmd, const wxString& arg, T value) {
- wxLogDebug(wxT("Adding macro: %s"), cmd);
+ wxLogDebug(wxT("Adding macro: %s"), cmd.c_str());
m_cmds.push_back(new eMacroCmd(cmd));
m_cmds.back().AddArg(arg, value);
m_isModified = true;
@@ -149,4 +149,4 @@ class eMacro {
boost::ptr_vector<eMacroCmd> m_cmds;
};
-#endif //__EMACRO_H__
+#endif //__EMACRO_H__
13 src/Makefile
View
@@ -1,8 +1,8 @@
VERBOSE=0
DEBUG=0
-VERSION=1.0
-RELEASE=31
+VERSION=2.0
+RELEASE=1
ROOTDIR=..
ifeq ($(VERBOSE),0)
@@ -52,9 +52,10 @@ INCLUDES = $(WXINCLUDES) $(OURINCLUDES) $(GTKINCLUDES) -I$(ROOTDIR)/ecore -I.
OURLIBPATHS = -L$(EXT_DIR)/lib
WXLIBS = $(shell $(EXT_DIR)/bin/wx-config --libs)
-WEBKIT_LIBS = -lwxwebkit -lwebcore-wx -ljscore
+WEBKIT_LIBS = -lwxwebkit -ljscore
+BOOST_LIBS = -lboost_system
-LIBS = $(OURLIBPATHS) -L$(ROOTDIR)/ecore -l$(ECORE) -lcurl -ltomcrypt -ltommath -lmk4 -lpcre -ltinyxml $(WEBKIT_LIBS) $(WXLIBS)
+LIBS = $(OURLIBPATHS) -L$(ROOTDIR)/ecore -l$(ECORE) -lcurl -ltomcrypt -ltommath -lmk4 -lpcre -ltinyxml $(WEBKIT_LIBS) $(WXLIBS) $(BOOST_LIBS)
# Exceptions which do not need to be compiled on linux
EXCEPT = CygwinDlg.cpp \
@@ -66,7 +67,7 @@ EXCEPT = CygwinDlg.cpp \
ShellContextMenu.cpp \
wxactivex.cpp
-SRCS = $(filter-out $(EXCEPT), $(wildcard *.cpp))
+SRCS = $(filter-out $(EXCEPT), $(wildcard *.cpp hessian_ipc/*.cpp webconnect/*.cpp))
OBJS = $(SRCS:%.cpp=$(OUTDIR)/%.o)
DEPS = $(SRCS:%.cpp=$(OUTDIR)/%.d)
@@ -83,7 +84,7 @@ $(EXE): $(OBJS)
$(SILENT)$(CXX) $(LDFLAGS) -o $(EXE) $(OBJS) $(LIBS) $(EXTOBJS)
$(OUTDIR)/%.o: %.cpp
- @-mkdir -p $(OUTDIR)
+ @-mkdir -p $(OUTDIR) $(OUTDIR)/hessian_ipc $(OUTDIR)/webconnect
@$(ECHO) "[CC] $<"
$(SILENT)$(CXX) $(INCLUDES) $(CXXFLAGS) -c -o $@ $<
2  src/ProjectPane.cpp
View
@@ -1232,7 +1232,9 @@ void ProjectPane::OnTreeContextMenu(wxTreeEvent& event) {
wxTreeItemId item = event.GetItem();
if (!item) return;
+#ifdef __WXMSW__
bool showExtendedItems = wxGetKeyState(WXK_SHIFT);
+#endif
// Get the path of the item clicked
const DirItemData *data = (DirItemData*)m_prjTree->GetItemData(item);
24 src/ProjectSettings.cpp
View
@@ -100,16 +100,16 @@ ProjectSettings::ProjectSettings(wxWindow* parent, const cxProjectInfo& project,
}
if (projectToLoad) {
- const wxString ind = wxJoin(projectToLoad->includeDirs, wxT('\n'), NULL);
+ const wxString ind = wxJoin(projectToLoad->includeDirs, wxT('\n'), wxT('\0'));
m_includeDirs->SetValue(ind);
- const wxString inf = wxJoin(projectToLoad->includeFiles, wxT('\n'), NULL);
+ const wxString inf = wxJoin(projectToLoad->includeFiles, wxT('\n'), wxT('\0'));
m_includeFiles->SetValue(inf);
- const wxString exd = wxJoin(projectToLoad->excludeDirs, wxT('\n'), NULL);
+ const wxString exd = wxJoin(projectToLoad->excludeDirs, wxT('\n'), wxT('\0'));
m_excludeDirs->SetValue(exd);
- const wxString exf = wxJoin(projectToLoad->excludeFiles, wxT('\n'), NULL);
+ const wxString exf = wxJoin(projectToLoad->excludeFiles, wxT('\n'), wxT('\0'));
m_excludeFiles->SetValue(exf);
}
@@ -142,10 +142,10 @@ void ProjectSettings::GetSettings(cxProjectInfo& project) const {
project.ClearFilters();
if (!m_inheritCheck->GetValue()) {
- const wxArrayString ind = wxSplit(m_includeDirs->GetValue(), wxT('\n'), NULL);
- const wxArrayString exd = wxSplit(m_excludeDirs->GetValue(), wxT('\n'), NULL);
- const wxArrayString inf = wxSplit(m_includeFiles->GetValue(), wxT('\n'), NULL);
- const wxArrayString exf = wxSplit(m_excludeFiles->GetValue(), wxT('\n'), NULL);
+ const wxArrayString ind = wxSplit(m_includeDirs->GetValue(), wxT('\n'), wxT('\0'));
+ const wxArrayString exd = wxSplit(m_excludeDirs->GetValue(), wxT('\n'), wxT('\0'));
+ const wxArrayString inf = wxSplit(m_includeFiles->GetValue(), wxT('\n'), wxT('\0'));
+ const wxArrayString exf = wxSplit(m_excludeFiles->GetValue(), wxT('\n'), wxT('\0'));
project.SetFilters(ind, exd, inf, exf);
}
@@ -158,16 +158,16 @@ void ProjectSettings::GetSettings(cxProjectInfo& project) const {
void ProjectSettings::OnInheritCheck(wxCommandEvent& event) {
if (event.IsChecked()) {
- const wxString ind = wxJoin(m_parentProject.includeDirs, wxT('\n'), NULL);
+ const wxString ind = wxJoin(m_parentProject.includeDirs, wxT('\n'), wxT('\0'));
m_includeDirs->SetValue(ind);
- const wxString inf = wxJoin(m_parentProject.includeFiles, wxT('\n'), NULL);
+ const wxString inf = wxJoin(m_parentProject.includeFiles, wxT('\n'), wxT('\0'));
m_includeFiles->SetValue(inf);
- const wxString exd = wxJoin(m_parentProject.excludeDirs, wxT('\n'), NULL);
+ const wxString exd = wxJoin(m_parentProject.excludeDirs, wxT('\n'), wxT('\0'));
m_excludeDirs->SetValue(exd);
- const wxString exf = wxJoin(m_parentProject.excludeFiles, wxT('\n'), NULL);
+ const wxString exf = wxJoin(m_parentProject.excludeFiles, wxT('\n'), wxT('\0'));
m_excludeFiles->SetValue(exf);
6 src/RemoteProfileDlg.cpp
View
@@ -239,13 +239,13 @@ void RemoteProfileDlg::OnButtonDelete(wxCommandEvent& WXUNUSED(event)) {
EnableSettings(false);
// Delete profile
- const uintptr_t profile_id = (uintptr_t)m_profileList->GetClientData(item);
+ const wxUIntPtr profile_id = (wxUIntPtr)m_profileList->GetClientData(item);
m_settings.DeleteRemoteProfile(profile_id);
m_profileList->Delete(item);
// Adjust subsequent profile id's
for (unsigned int i = 0; i < m_profileList->GetCount(); ++i) {
- const uintptr_t id = (uintptr_t)m_profileList->GetClientData(i);
+ const wxUIntPtr id = (wxUIntPtr)m_profileList->GetClientData(i);
if (id > profile_id) {
m_profileList->SetClientData(i, (void*)(id-1));
}
@@ -277,7 +277,7 @@ void RemoteProfileDlg::OnTextName(wxCommandEvent& event) {
}
void RemoteProfileDlg::OnProfileList(wxCommandEvent& event) {
- const uintptr_t profile_id = (uintptr_t)m_profileList->GetClientData(event.GetInt());
+ const wxUIntPtr profile_id = (wxUIntPtr)m_profileList->GetClientData(event.GetInt());
SetProfile(profile_id);
}
7 src/SearchPanel.cpp
View
@@ -69,9 +69,8 @@ END_EVENT_TABLE()
SearchPanel::SearchPanel(IFrameSearchService& searchService, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size):
wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL|wxCLIP_CHILDREN|wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE),
- m_searchService(searchService),
- m_use_regex(false), m_match_case(false), m_highlight(true), restart_next_search(false), nosearch(false),
- m_settings(eGetSettings())
+ m_searchService(searchService), m_settings(eGetSettings()),
+ m_use_regex(false), m_match_case(false), m_highlight(true), restart_next_search(false), nosearch(false)
{
InitAcceleratorTable();
@@ -245,7 +244,7 @@ void SearchPanel::SetState(cxFindResult result, int resultCount) {
}
searchbox->Refresh();
- wxString results = (0 <= resultCount) ? wxString::Format(wxT("%d results"), resultCount) : wxEmptyString;
+ wxString results = (0 <= resultCount) ? wxString::Format(wxT("%d results"), resultCount) : wxGetEmptyString();
commandResults->SetLabel(results);
}
4 src/Strings.cpp
View
@@ -258,14 +258,14 @@ bool DetectTextEncoding(const char* buffer, size_t len, wxFontEncoding& encoding
}
// Detect UTF-32 by scanning for newlines (and lack of null chars)
- if ((uintptr_t)buff_ptr % 4 == 0 && buff_ptr+4 <= buff_end) {
+ if ((wxUIntPtr)buff_ptr % 4 == 0 && buff_ptr+4 <= buff_end) {
if (*((wxUint32*)buff_ptr) == 0) ++bad_utf32_count;
if (*((wxUint32*)buff_ptr) == wxUINT32_SWAP_ON_BE(0x0A)) ++nl_utf32le_count;
if (*((wxUint32*)buff_ptr) == wxUINT32_SWAP_ON_LE(0x0A)) ++nl_utf32be_count;
}
// Detect UTF-16 by scanning for newlines (and lack of null chars)
- if ((uintptr_t)buff_ptr % 2 == 0 && buff_ptr+4 <= buff_end) {
+ if ((wxUIntPtr)buff_ptr % 2 == 0 && buff_ptr+4 <= buff_end) {
if (*((wxUint16*)buff_ptr) == 0) ++bad_utf16_count;
if (*((wxUint16*)buff_ptr) == wxUINT16_SWAP_ON_BE(0x0A)) ++nl_utf16le_count;
if (*((wxUint16*)buff_ptr) == wxUINT16_SWAP_ON_LE(0x0A)) ++nl_utf16be_count;
4 src/WebKitHtmlWnd.cpp
View
@@ -19,7 +19,9 @@ BEGIN_EVENT_TABLE(wxBrowser, wxWebView)
EVT_WEBVIEW_BEFORE_LOAD(wxID_ANY, wxBrowser::OnBeforeLoad)
END_EVENT_TABLE()
-wxBrowser::wxBrowser(wxWindow *parent, wxWindowID id) : wxWebView(parent, id), m_realLocation(wxT("")) {
+wxBrowser::wxBrowser(wxWindow *parent, wxWindowID id, const wxPoint& point, const wxSize& size) :
+ wxWebView(parent, id, point, size), m_realLocation(wxT(""))
+{
/* force JSC threading initialization until Webkit fix this */
wxWebView::SetPageSource(wxT("<html><head /><body /></html>"));
}
5 src/WebKitHtmlWnd.h
View
@@ -22,10 +22,11 @@
class wxBrowser : public wxWebView, public virtual IHtmlWnd {
DECLARE_EVENT_TABLE()
public:
- wxBrowser(wxWindow *parent, wxWindowID id);
+ wxBrowser(wxWindow *parent, wxWindowID id = wxID_ANY,
+ const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize);
virtual ~wxBrowser();
virtual wxWindow* GetWindow();
- virtual bool LoadString(wxString html);
+ virtual bool LoadString(const wxString& html);
virtual void LoadUrl(const wxString &_url, const wxString &_frame = wxEmptyString, bool keepHistory=false);
virtual bool Refresh(wxHtmlRefreshLevel level);
virtual bool GoBack();
2  src/cx_pcre_internal.h
View
@@ -1708,7 +1708,7 @@ sense, but are not part of the PCRE public API. */
extern BOOL _pcre_is_newline(USPTR, int, USPTR,
int *, BOOL);
-extern int _pcre_ord2utf8(int, uschar *);
+PCRE_EXP_DECL int _pcre_ord2utf8(int, uschar *);
extern real_pcre *_pcre_try_flipped(const real_pcre *, real_pcre *,
const pcre_study_data *, pcre_study_data *);
extern int _pcre_valid_utf8(USPTR, int);
13 src/cx_pcre_tables.cpp
View
@@ -87,6 +87,19 @@ const uschar _pcre_utf8_table4[] = {
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5 };
+/* Table to translate from particular type value to the general value. */
+
+const int _pcre_ucp_gentype[] = {
+ ucp_C, ucp_C, ucp_C, ucp_C, ucp_C, /* Cc, Cf, Cn, Co, Cs */
+ ucp_L, ucp_L, ucp_L, ucp_L, ucp_L, /* Ll, Lu, Lm, Lo, Lt */
+ ucp_M, ucp_M, ucp_M, /* Mc, Me, Mn */
+ ucp_N, ucp_N, ucp_N, /* Nd, Nl, No */
+ ucp_P, ucp_P, ucp_P, ucp_P, ucp_P, /* Pc, Pd, Pe, Pf, Pi */
+ ucp_P, ucp_P, /* Ps, Po */
+ ucp_S, ucp_S, ucp_S, ucp_S, /* Sc, Sk, Sm, So */
+ ucp_Z, ucp_Z, ucp_Z /* Zl, Zp, Zs */
+};
+
/* The pcre_utt[] table below translates Unicode property names into type and
code values. It is searched by binary chop, so must be in collating sequence of
name. Originally, the table contained pointers to the name strings in the first
2  src/eApp.h
View
@@ -51,7 +51,7 @@ class eApp : public wxApp,
int OnExit();
const wxString& VersionName() const { return m_version_name; }
- const unsigned int VersionId() const { return m_version_id; }
+ unsigned int VersionId() const { return m_version_id; }
// Frames
EditorFrame* NewFrame();
24 src/eConnection.cpp
View
@@ -1,34 +1,34 @@
-#include "eConnection.h"
-#include "IIpcHandler.h"
-
-eConnection::eConnection(boost::asio::io_service& io_service, hessian_ipc::connection_manager& manager, IIpcHandler& handler)
+#include "eConnection.h"
+#include "IIpcHandler.h"
+
+eIpcConnection::eIpcConnection(boost::asio::io_service& io_service, hessian_ipc::connection_manager& manager, IIpcHandler& handler)
: hessian_ipc::connection(io_service, manager), m_handler(handler)
{
}
-eConnection::~eConnection() {
+eIpcConnection::~eIpcConnection() {
}
-void eConnection::invoke_method() {
+void eIpcConnection::invoke_method() {
m_handler.handle_call(*this);
}
-void eConnection::on_close() {
+void eIpcConnection::on_close() {
m_handler.handle_close(*this);
}
-const hessian_ipc::Call* eConnection::get_call() {
+const hessian_ipc::Call* eIpcConnection::get_call() {
return request_;
}
-hessian_ipc::Writer& eConnection::get_reply_writer() {
+hessian_ipc::Writer& eIpcConnection::get_reply_writer() {
return writer_;
}
-void eConnection::reply_done() {
+void eIpcConnection::reply_done() {
connection::reply_done();
}
-void eConnection::notifier_done() {
+void eIpcConnection::notifier_done() {
connection::notifier_done();
-}
+}
6 src/eConnection.h
View
@@ -20,10 +20,10 @@
// Pre-definitions
class IIpcHandler;
-class eConnection : public hessian_ipc::connection, public IConnection {
+class eIpcConnection : public hessian_ipc::connection, public IConnection {
public:
- explicit eConnection(boost::asio::io_service& io_service, hessian_ipc::connection_manager& manager, IIpcHandler& handler);
- virtual ~eConnection();
+ explicit eIpcConnection(boost::asio::io_service& io_service, hessian_ipc::connection_manager& manager, IIpcHandler& handler);
+ virtual ~eIpcConnection();
// Method handling
void invoke_method();
2  src/eDocumentPath.cpp
View
@@ -41,7 +41,7 @@ FILE_PERMISSIONS eDocumentPath::GetPermissions(const wxString& path) {
#else
// Get protection
struct stat s;
- int res = stat(path.mb_str(wxConvUTF8), &s);
+ stat(path.mb_str(wxConvUTF8), &s);
return s.st_mode;
#endif
}
4 src/eServer.cpp
View
@@ -19,9 +19,9 @@ void eServer::destroy() {
}
hessian_ipc::connection* eServer::new_connection() {
- return new eConnection(io_service_, connection_manager_, m_handler);
+ return new eIpcConnection(io_service_, connection_manager_, m_handler);
}
IIpcServer* NewIpcServer(IIpcHandler& handler) {
return new eServer(handler);
-}
+}
2  src/hessian_ipc/connection.h
View
@@ -70,7 +70,7 @@ class connection
boost::shared_ptr<connection> keep_alive_; // Ensure that conn is not deleted during calls
boost::mutex queue_lock_;
std::vector<unsigned char>* reply_ptr_; // Only one item in queue can be a reply
- boost::ptr_deque<std::vector<unsigned char>> queue_;
+ boost::ptr_deque< std::vector<unsigned char> > queue_;
bool write_in_progress_;
};
7 src/hessian_ipc/hessian_values.cpp
View
@@ -132,6 +132,11 @@ void Writer::write(unsigned int value) {
write((int)value);
}
+// write unsigned long
+void Writer::write(unsigned long value) {
+ write((long long)value);
+}
+
// write 64bit integer
void Writer::write(long long value) {
if (-0x08 <= value && value <= 0x0f) {
@@ -462,4 +467,4 @@ void Call::Write(Writer& writer) const {
}
}
-} // namespace hessian_ipc
+} // namespace hessian_ipc
3  src/hessian_ipc/hessian_values.h
View
@@ -76,6 +76,7 @@ namespace hessian_ipc {
void write(bool value);
void write(int value);
void write(unsigned int value);
+ void write(unsigned long value);
void write(long long value);
void write(const char* value);
void write(const string& value);
@@ -332,4 +333,4 @@ namespace hessian_ipc {
#include "hessian_writers.h"
-#endif //HESSIAN_VALUES_H
+#endif //HESSIAN_VALUES_H
4 src/hessian_ipc/hessian_writers.h
View
@@ -47,7 +47,7 @@ template<class T> void Writer::write_notifier(unsigned int notifier_id, const T&
template<class T> void Writer::write(const vector<T>& value) {
out.push_back(0x57); // tag for variable-length untyped list
- for (vector<T>::const_iterator p = value.begin(); p != value.end(); ++p) {
+ for (typename vector<T>::const_iterator p = value.begin(); p != value.end(); ++p) {
write(*p);
}
out.push_back('Z');
@@ -57,7 +57,7 @@ template<class T1, class T2> void Writer::write(const map<T1,T2>& value) {
const size_t len = value.size();
out.push_back('H'); // tag for untyped map
- for (map<T1,T2>::const_iterator p = value.begin(); p != value.end(); ++p) {
+ for (typename map<T1,T2>::const_iterator p = value.begin(); p != value.end(); ++p) {
write(*(p->first));
write(*(p->second));
}
4 src/hessian_ipc/proxy.h
View
@@ -36,7 +36,7 @@ template<class T> const Value& proxy::call(const string& method, const T& arg) {
m_writer.call(method, arg);
const string& out = m_writer.GetOutput();
- return do_hessian_call(out);
+ return do_hessian_call(vector<unsigned char>(out.begin(), out.end()));
}
template<class T> int proxy::call_int(const string& method, const T& arg) {
@@ -56,4 +56,4 @@ template<class T> std::string proxy::call_string(const string& method, const T&
} // namespace hessian_ipc
-#endif //HESSIAN_IPC_PROXY_H
+#endif //HESSIAN_IPC_PROXY_H
2  src/key_hook.h
View
@@ -10,9 +10,11 @@
#endif
#ifdef __WXGTK__
+#define GSocket GlibGSocket
#include <gtk/gtk.h>
//#include <gdk/gdkevents.h>
//#include <gdk/gdkwindow.h>
+#undef GSocket
#endif
#include <map>
5 src/plistHandler.cpp
View
@@ -224,13 +224,14 @@ PListHandler::PListHandler(const wxString& appPath, const wxString& appDataPath,
m_localBundleDir.AppendDir(wxT("Bundles"));
#ifdef __WXDEBUG__
- wxStartTimer();
+ wxStopWatch perftimer;
+ perftimer.Start();
#endif
Update(UPDATE_SYNTAXONLY);
#ifdef __WXDEBUG__
- wxLogDebug(wxT("Bundle Update Time: %d"), wxGetElapsedTime());
+ wxLogDebug(wxT("Bundle Update Time: %ld"), perftimer.Time());
#endif
}
2  src/webconnect/webframe.h
View
@@ -13,6 +13,8 @@
#ifndef __WXWEBCONNECT_WEBFRAME_H
#define __WXWEBCONNECT_WEBFRAME_H
+// HACK wxWebKit and wxWebconnect both define wxWebFrame class so rename one of them
+#define wxWebFrame wxWebconnectFrame
///////////////////////////////////////////////////////////////////////////////
Please sign in to comment.
Something went wrong with that request. Please try again.