Skip to content

Commit 20ae754

Browse files
lixun910lixun910
authored
[Fix] check a wxMenuItem raises error msg box (#2526)
1 parent 0162b81 commit 20ae754

21 files changed

Lines changed: 468 additions & 455 deletions

‎.github/workflows/osx_build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
47-
- uses: actions/checkout@v3
47+
- uses: actions/checkout@v4
4848

4949
- name: Install application certificate
5050
uses: apple-actions/import-codesign-certs@v2
@@ -72,7 +72,7 @@ jobs:
7272
sudo ln -s /opt/homebrew/opt/gdal /usr/local/opt/gdal
7373
sudo ln -s /opt/homebrew/opt/proj /usr/local/opt/proj
7474
75-
- uses: actions/cache@v3
75+
- uses: actions/cache@v4
7676
id: cache
7777
with:
7878
path: |
@@ -109,7 +109,7 @@ jobs:
109109
codesign --timestamp -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" -i edu.uchicago.spatial GeoDa$GEODA_VERSION-Installer.dmg
110110
111111
# Upload artifact
112-
- uses: actions/upload-artifact@v3
112+
- uses: actions/upload-artifact@v4
113113
with:
114114
name: GeoDa-${{ env.GEODA_VER }}-${{ env.GEODA_ARCH }}-MacOS
115115
path: ${{ github.workspace }}/BuildTools/macosx/create-dmg/GeoDa${{ env.GEODA_VER }}-${{ env.GEODA_ARCH }}-Installer.dmg

‎.github/workflows/ubuntu_build.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,13 @@ jobs:
3131
distro:
3232
- 'ubuntu-24.04'
3333
- 'ubuntu-22.04'
34-
- 'ubuntu-20.04'
3534
include:
3635
- distro: 'ubuntu-24.04'
3736
pre: 'noble'
3837
ldflags: '-lgdal -lcurl -L/usr/lib/x86_64-linux-gnu -lz -lwebkit2gtk-4.1 -lEGL -ljavascriptcoregtk-4.1'
3938
- distro: 'ubuntu-22.04'
4039
pre: 'jammy'
4140
ldflags: '-lgdal -lcurl -L/usr/lib/x86_64-linux-gnu -lz -lwebkit2gtk-4.0 -lEGL -ljavascriptcoregtk-4.0'
42-
- distro: 'ubuntu-20.04'
43-
pre: 'focal'
44-
ldflags: '-lgdal -lcurl -L/usr/lib/x86_64-linux-gnu -lz -lwebkit2gtk-4.0 -lEGL -ljavascriptcoregtk-4.0'
4541

4642
env:
4743
platform: ${{ matrix.distro }}
@@ -52,7 +48,7 @@ jobs:
5248
# Steps represent a sequence of tasks that will be executed as part of the job
5349
steps:
5450
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
55-
- uses: actions/checkout@v3
51+
- uses: actions/checkout@v4
5652

5753
- name: Prepare on ${{ matrix.distro }}
5854
run: |
@@ -78,7 +74,7 @@ jobs:
7874
sudo apt-get install -y libwebkitgtk-3.0-dev
7975
fi
8076
81-
- uses: actions/cache@v3
77+
- uses: actions/cache@v4
8278
id: cache
8379
with:
8480
path: |
@@ -111,7 +107,7 @@ jobs:
111107
./install.sh
112108
113109
# Upload artifact
114-
- uses: actions/upload-artifact@v3
110+
- uses: actions/upload-artifact@v4
115111
with:
116112
name: GeoDa-${{ env.GEODA_VER }}-${{ env.TARGET_OS }}
117113
path: ${{ github.workspace }}/BuildTools/ubuntu/geoda_${{ env.GEODA_VER }}-1${{ env.TARGET_OS }}1_amd64.deb

‎.github/workflows/windows_build.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ jobs:
2222
# This workflow contains a single job called "build"
2323
windows_build:
2424
# The type of runner that the job will run on
25-
runs-on: windows-2019
25+
runs-on: windows-2022
2626
if: ${{ !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') }}
2727

2828
strategy:
2929
matrix:
3030
include:
31-
- VS_VERSION: Visual Studio 16
32-
VS_VER: 2019
33-
MSVC_VER: 1920
31+
- VS_VERSION: Visual Studio 17
32+
VS_VER: 2022
33+
MSVC_VER: 1930
3434
platform: x64
35-
- VS_VERSION: Visual Studio 16
36-
VS_VER: 2019
37-
MSVC_VER: 1920
35+
- VS_VERSION: Visual Studio 17
36+
VS_VER: 2022
37+
MSVC_VER: 1930
3838
platform: x86
3939

4040
env:
@@ -49,7 +49,7 @@ jobs:
4949

5050
steps:
5151
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
52-
- uses: actions/checkout@v3
52+
- uses: actions/checkout@v4
5353

5454
# Set environment
5555
- name: Set environment
@@ -75,13 +75,13 @@ jobs:
7575
- name: Set compiler environment
7676
shell: cmd
7777
run: |
78-
if "%VS_VER%" == "2019" CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=%ARCHITECTURE%
78+
if "%VS_VER%" == "2022" CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=%ARCHITECTURE%
7979
echo ::set-env name=PATH::%PATH%
8080
echo ::set-env name=INCLUDE::%INCLUDE%
8181
echo ::set-env name=LIB::%LIB%
8282
echo ::set-env name=LIBPATH::%LIBPATH%
8383
84-
- uses: actions/cache@v3
84+
- uses: actions/cache@v4
8585
id: cache
8686
with:
8787
path: |
@@ -113,7 +113,7 @@ jobs:
113113
# install pscx powershell and vSSetup
114114
Install-Module Pscx -AllowClobber
115115
Install-Module VSSetup -Scope CurrentUser
116-
if($env:VS_VER -eq "2019")
116+
if($env:VS_VER -eq "2022")
117117
{
118118
}
119119
else
@@ -238,7 +238,7 @@ jobs:
238238
# install pscx powershell and vSSetup
239239
Install-Module Pscx -AllowClobber
240240
Install-Module VSSetup -Scope CurrentUser
241-
if($env:VS_VER -eq "2019")
241+
if($env:VS_VER -eq "2022")
242242
{
243243
}
244244
else
@@ -268,12 +268,12 @@ jobs:
268268
}
269269
dir
270270
271-
- uses: actions/upload-artifact@v3
271+
- uses: actions/upload-artifact@v4
272272
with:
273273
name: GeoDa-Windows-${{ env.platform }}-installer
274274
path: ${{ github.workspace }}\BuildTools\windows\GeoDa_1.22_${{ env.platform }}_Setup.exe
275275

276-
- uses: actions/upload-artifact@v3
276+
- uses: actions/upload-artifact@v4
277277
with:
278278
name: GeoDa-Windows7+-${{ env.platform }}-installer
279279
path: ${{ github.workspace }}\BuildTools\windows\GeoDa_1.22_win7+${{ env.platform }}_Setup.exe

‎BuildTools/windows/GeoDa.vs2019.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<ClCompile>
9191
<Optimization>Disabled</Optimization>
9292
<AdditionalIncludeDirectories>temp\OpenCL\sdk\include;temp\boost;temp\wxWidgets\lib\vc_dll\mswud;temp\wxWidgets\include;temp\json_spirit_v4.08;temp\eigen3;temp\spectra\include;libraries\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
93-
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_WINDOWS;NOMINMAX;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
93+
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_WINDOWS;NOMINMAX;__WXMSW__;WXUSINGDLL;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9494
<MinimalRebuild>false</MinimalRebuild>
9595
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
9696
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -122,7 +122,7 @@
122122
<ClCompile>
123123
<Optimization>Disabled</Optimization>
124124
<AdditionalIncludeDirectories>temp\OpenCL\sdk\include;temp\wxWidgets\lib\vc_dll\mswud;temp\wxWidgets\include;temp\boost\include;temp\json_spirit_v4.08;temp\eigen3;temp\spectra\include;libraries\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
125-
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_WINDOWS;NOMINMAX;__WXMSW__;__WXDEBUG__;WXUSINGDLL;_UNICODE;__PROJ6__%(PreprocessorDefinitions)</PreprocessorDefinitions>
125+
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_WINDOWS;NOMINMAX;__WXMSW__;WXUSINGDLL;_UNICODE;__PROJ6__%(PreprocessorDefinitions)</PreprocessorDefinitions>
126126
<MinimalRebuild>false</MinimalRebuild>
127127
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
128128
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

0 commit comments

Comments
 (0)