Skip to content

Commit 310416e

Browse files
mcorinomcorino
authored
Merge pull request #482 from mcorino/develop
Add WebView support
2 parents d96c7be + 9030915 commit 310416e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+4199
-106
lines changed

‎.github/workflows/linux-master.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
wxWidgets: 'master'
3131
swig: '4'
3232
use_xvfb: true
33+
configure_flags: --enable-webview
3334
wxw_type: develop
3435
wxr_type: develop
3536
wxr_test_exclude: 'test_media_ctrl'
@@ -41,6 +42,7 @@ jobs:
4142
wxWidgets: 'master'
4243
swig: '4'
4344
use_xvfb: true
45+
configure_flags: --enable-webview
4446
wxw_type: develop
4547
wxr_type: gem
4648
wxr_test_exclude: 'test_media_ctrl'

‎.github/workflows/linux.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
ruby: '3.0'
5959
swig: '4'
6060
use_xvfb: true
61+
configure_flags: --disable-webview
6162
wxw_type: system
6263
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
6364
wxr_type: develop
@@ -68,6 +69,7 @@ jobs:
6869
ruby: '3.4'
6970
swig: '4'
7071
use_xvfb: true
72+
configure_flags: --enable-webview
7173
wxw_type: develop
7274
wxw_version: '${{ vars.WXWIDGETS_PREV_STABLE }}'
7375
wxr_type: develop
@@ -77,7 +79,7 @@ jobs:
7779
CXX: g++
7880
ruby: '3.4'
7981
swig: '4'
80-
use_xvfb: true
82+
configure_flags: --enable-webview
8183
wxw_type: system
8284
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
8385
wxr_type: gem
@@ -108,6 +110,7 @@ jobs:
108110
ruby: 'ruby'
109111
swig: '4'
110112
use_xvfb: true
113+
configure_flags: --enable-webview
111114
wxw_type: develop
112115
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
113116
wxr_type: develop
@@ -130,6 +133,7 @@ jobs:
130133
ruby: 'system'
131134
swig: '4'
132135
use_xvfb: true
136+
configure_flags: --enable-webview
133137
wxw_type: develop
134138
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
135139
wxr_type: gem

‎.github/workflows/mac-master.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
wxWidgets: 'master'
3333
ruby: 'ruby'
3434
swig: '4'
35-
configure_flags: --disable-sys-libs
35+
configure_flags: --disable-sys-libs --enable-webview
3636
wxw_type: develop
3737
wxr_type: develop
3838
- name: wxMac macOS 14
@@ -41,7 +41,7 @@ jobs:
4141
wxWidgets: 'master'
4242
ruby: '3.0'
4343
swig: '4'
44-
configure_flags: --disable-sys-libs
44+
configure_flags: --disable-sys-libs --enable-webview
4545
wxw_type: develop
4646
wxr_type: gem
4747
- name: wxMac macOS 26
@@ -50,7 +50,7 @@ jobs:
5050
wxWidgets: 'master'
5151
ruby: '3.4'
5252
swig: '4'
53-
configure_flags: --disable-sys-libs
53+
configure_flags: --disable-sys-libs --enable-webview
5454
wxw_type: develop
5555
wxr_type: develop
5656

‎.github/workflows/mac.yml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
arch: x86_64
5959
ruby: '3.4'
6060
swig: '4'
61-
configure_flags: --disable-sys-libs
61+
configure_flags: --disable-sys-libs --disable-webview
6262
wxw_type: develop
6363
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
6464
wxr_type: develop
@@ -67,7 +67,7 @@ jobs:
6767
arch: arm64
6868
ruby: 'ruby'
6969
swig: '4'
70-
configure_flags: --disable-sys-libs
70+
configure_flags: --disable-sys-libs --enable-webview
7171
wxw_type: embed
7272
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
7373
wxr_type: binpkg
@@ -76,7 +76,7 @@ jobs:
7676
arch: arm64
7777
ruby: 'ruby'
7878
swig: '4'
79-
configure_flags: --disable-sys-libs
79+
configure_flags: --disable-sys-libs --enable-webview
8080
wxw_type: embed
8181
wxw_version: '${{ vars.WXWIDGETS_PREV_STABLE }}'
8282
wxr_type: gem
@@ -85,7 +85,7 @@ jobs:
8585
arch: arm64
8686
ruby: '3.2'
8787
swig: '4'
88-
configure_flags: --disable-sys-libs
88+
configure_flags: --disable-sys-libs --enable-webview
8989
wxw_type: develop
9090
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
9191
wxr_type: develop
@@ -94,7 +94,7 @@ jobs:
9494
arch: arm64
9595
ruby: 'ruby'
9696
swig: '4'
97-
configure_flags: --disable-sys-libs
97+
configure_flags: --disable-sys-libs --enable-webview
9898
wxw_type: embed
9999
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
100100
wxr_type: binpkg
@@ -103,7 +103,7 @@ jobs:
103103
arch: x86_64
104104
ruby: 'ruby'
105105
swig: '4'
106-
configure_flags: --disable-sys-libs
106+
configure_flags: --disable-sys-libs --enable-webview
107107
wxw_type: embed
108108
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
109109
wxr_type: gem
@@ -112,7 +112,7 @@ jobs:
112112
arch: x86_64
113113
ruby: 'ruby'
114114
swig: '4'
115-
configure_flags: --disable-sys-libs
115+
configure_flags: --disable-sys-libs --enable-webview
116116
wxw_type: embed
117117
wxw_version: '${{ vars.WXWIDGETS_PREV_STABLE }}'
118118
wxr_type: gem
@@ -121,7 +121,7 @@ jobs:
121121
arch: arm64
122122
ruby: '3.0'
123123
swig: '4'
124-
configure_flags: --disable-sys-libs
124+
configure_flags: --disable-sys-libs --enable-webview
125125
wxw_type: develop
126126
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
127127
wxr_type: develop
@@ -130,7 +130,7 @@ jobs:
130130
arch: arm64
131131
ruby: 'ruby'
132132
swig: '4'
133-
configure_flags: --disable-sys-libs
133+
configure_flags: --disable-sys-libs --enable-webview
134134
wxw_type: embed
135135
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
136136
wxr_type: gem
@@ -139,7 +139,7 @@ jobs:
139139
arch: arm64
140140
ruby: 'ruby'
141141
swig: '4'
142-
configure_flags: --disable-sys-libs
142+
configure_flags: --disable-sys-libs --enable-webview
143143
wxw_type: embed
144144
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
145145
wxr_type: binpkg
@@ -260,6 +260,10 @@ jobs:
260260
run: |
261261
wxCONFIGURE_OPTIONS="--disable-sys-libs --without-liblzma ${{ matrix.configure_flags }}"
262262
263+
wxWEBVIEW_USE="--enable-webview"
264+
if [ "${{ matrix.use_webview }}" == "false" ]; then
265+
wxWEBVIEW_USE="--disable-webview"
266+
fi
263267
if [ "${{ matrix.wxw_type }}" == "develop" ]; then
264268
./configure $wxCONFIGURE_OPTIONS --disable-optimise --prefix=$WXWIN_INSTALL --disable-tests --without-subdirs --disable-debug_info || rc=$?
265269
else

‎.github/workflows/msw-master.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
ruby: 'ruby'
3434
wxWidgets: 'master'
3535
swig: '4'
36+
configure_flags: --enable-webview
3637
wxw_type: develop
3738
wxr_type: develop
3839
- os: windows-2022
@@ -41,6 +42,7 @@ jobs:
4142
ruby: '3.2'
4243
wxWidgets: 'master'
4344
swig: '4'
45+
configure_flags: --enable-webview
4446
wxw_type: develop
4547
wxr_type: gem
4648

@@ -100,7 +102,7 @@ jobs:
100102
if: matrix.wxw_type != 'embed'
101103
working-directory: ${{ env.WXWIDGETS_ROOT }}
102104
run: |
103-
ridk exec bash -c './configure --prefix=`pwd`/install --disable-tests --without-subdirs --without-regex --without-libcurl --with-expat=builtin --with-zlib=builtin --disable-debug_info'
105+
ridk exec bash -c './configure --prefix=`pwd`/install --disable-tests --without-subdirs --without-regex --without-libcurl --with-expat=builtin --with-zlib=builtin --disable-debug_info ${{matrix.configure_flags}}'
104106
105107
- name: Build wxWidgets
106108
if: matrix.wxw_type != 'embed'

‎.github/workflows/msw.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
CXX: g++-12
6161
ruby: '3.0'
6262
swig: '4'
63+
configure_flags: --enable-webview
6364
wxw_type: embed
6465
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
6566
wxr_type: develop
@@ -68,6 +69,7 @@ jobs:
6869
CXX: g++-12
6970
ruby: '3.1'
7071
swig: '4'
72+
configure_flags: --enable-webview
7173
wxw_type: embed
7274
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
7375
wxr_type: gem
@@ -76,6 +78,7 @@ jobs:
7678
CXX: g++-12
7779
ruby: 'ruby'
7880
swig: '4'
81+
configure_flags: --enable-webview
7982
wxw_type: embed
8083
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
8184
wxr_type: develop
@@ -84,6 +87,7 @@ jobs:
8487
CXX: g++-12
8588
ruby: 'ruby'
8689
swig: '4'
90+
configure_flags: --disable-webview
8791
wxw_type: develop
8892
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
8993
wxr_type: develop
@@ -92,6 +96,7 @@ jobs:
9296
CXX: g++-12
9397
ruby: 'ruby'
9498
swig: '4'
99+
configure_flags: --enable-webview
95100
wxw_type: embed
96101
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
97102
wxr_type: binpkg
@@ -100,6 +105,7 @@ jobs:
100105
CXX: g++-12
101106
ruby: 'ruby'
102107
swig: '4'
108+
configure_flags: --enable-webview
103109
wxw_type: embed
104110
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
105111
wxr_type: gem
@@ -108,6 +114,7 @@ jobs:
108114
CXX: g++-12
109115
ruby: 'ruby'
110116
swig: '4'
117+
configure_flags: --enable-webview
111118
wxw_type: embed
112119
wxw_version: '${{ vars.WXWIDGETS_PREV_STABLE }}'
113120
wxr_type: gem
@@ -116,6 +123,7 @@ jobs:
116123
CXX: g++-12
117124
ruby: 'ruby'
118125
swig: '4'
126+
configure_flags: --enable-webview
119127
wxw_type: develop
120128
wxw_version: '${{ vars.WXWIDGETS_LATEST_STABLE }}'
121129
wxr_type: gem
@@ -177,7 +185,7 @@ jobs:
177185
if: matrix.wxw_type != 'embed'
178186
working-directory: ${{ env.WXWIDGETS_ROOT }}
179187
run: |
180-
ridk exec bash -c './configure --prefix=`pwd`/install --disable-tests --without-subdirs --without-regex --without-libcurl --with-expat=builtin --with-zlib=builtin --disable-debug_info'
188+
ridk exec bash -c './configure --prefix=`pwd`/install --disable-tests --without-subdirs --without-regex --without-libcurl --with-expat=builtin --with-zlib=builtin --disable-debug_info ${{matrix.configure_flags}}'
181189
182190
- name: Build wxWidgets
183191
if: matrix.wxw_type != 'embed'

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
*.o
22
*.so
33
.*
4+
*.bundle
5+
*.dylib
6+
*.dll
47
bin
58
obj
69
src
@@ -10,8 +13,10 @@ pkg
1013
rakelib/deps
1114
ext/wxruby3/swig/classes
1215
ext/wxruby3/lib
16+
ext/wxWidgets
1317
lib/wx/doc/gen
1418
lib/wx/**/ext
1519
lib/wx/**/events
1620
lib/wx/core/font
1721
*.old
22+
*.gemspec

0 commit comments

Comments
 (0)