Skip to content

Commit 6e075a7

Browse files
RavbugRavbug
committed
Update wxWidgets to add live search
1 parent b55517c commit 6e075a7

File tree

3,296 files changed

+856440
-461635
lines changed

Some content is hidden

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

3,296 files changed

+856440
-461635
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ cmake --build . --config Release --target install
3939
```
4040

4141
## Issues
42-
Please report all problems in the [Issues](https://github.com/Ravbug/wxWidgetsTemplate/issues) section of this repository.
42+
Please report all problems in the [Issues](https://github.com/Ravbug/UnityHubNative/issues) section of this repository.
4343
Make sure to include as many details as possible, or I won't be able to fix it.

‎source/interface_derived.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ EVT_BUTTON(ACTIV_PERSONAL, MainFrameDerived::OnActivatePersonal)
5656
EVT_LIST_ITEM_ACTIVATED(wxID_HARDDISK, MainFrameDerived::OnOpenProject)
5757
EVT_LISTBOX_DCLICK(wxID_FLOPPY,MainFrameDerived::OnRevealEditor)
5858
EVT_LISTBOX_DCLICK(wxID_HOME,MainFrameDerived::OnRevealInstallLocation)
59-
EVT_SEARCHCTRL_SEARCH_BTN(FILTER_PROJ_ID,MainFrameDerived::Filter)
60-
EVT_SEARCHCTRL_CANCEL_BTN(FILTER_PROJ_ID, MainFrameDerived::Filter)
59+
//EVT_SEARCHCTRL_SEARCH_BTN(FILTER_PROJ_ID,MainFrameDerived::Filter)
60+
//EVT_SEARCHCTRL_CANCEL_BTN(FILTER_PROJ_ID, MainFrameDerived::Filter)
6161

6262
wxEND_EVENT_TABLE()
6363

@@ -94,7 +94,7 @@ MainFrameDerived::MainFrameDerived() : MainFrame(NULL){
9494

9595
//show current version in titlebar
9696
this->SetLabel("Unity Hub Native " + AppVersion);
97-
97+
projSearchCtrl->Bind(wxEVT_KEY_UP, &MainFrameDerived::Filter, this);
9898
projSearchCtrl->SetFocus();
9999
}
100100

@@ -165,7 +165,7 @@ void MainFrameDerived::LoadProjects(const std::string &filter){
165165
}
166166
}
167167

168-
void MainFrameDerived::Filter(wxCommandEvent &){
168+
void MainFrameDerived::Filter(wxKeyEvent &){
169169
projectsList->DeleteAllItems();
170170
projects.clear();
171171
auto filter = projSearchCtrl->GetValue();
@@ -455,7 +455,9 @@ void MainFrameDerived::AddProject(const project& p, const std::string& filter){
455455
projects.insert(projects.begin(),p);
456456

457457
//save to file
458-
SaveProjects();
458+
if (filter == ""){
459+
SaveProjects();
460+
}
459461

460462
//add (painfully) to the UI
461463
auto name = p.name;

‎source/interface_derived.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class MainFrameDerived : public MainFrame{
3939
void ReloadData();
4040
void OnActivateProPlus(wxCommandEvent&);
4141
void OnActivatePersonal(wxCommandEvent&);
42-
void Filter(wxCommandEvent&);
42+
void Filter(wxKeyEvent&);
4343
void LoadProjects(const std::string& filter);
4444

4545
//will store the list of projects

‎wxWidgets/.circleci/config.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# Config file for CI jobs on CircleCI (circleci.com).
2+
version: 2.1
3+
4+
jobs:
5+
build-fedora:
6+
docker:
7+
- image: fedora
8+
steps:
9+
- run:
10+
name: Install Git
11+
command: dnf install -y git
12+
13+
- checkout
14+
15+
- run:
16+
name: Install dependencies
17+
command: |
18+
echo LD_LIBRARY_PATH=`pwd`/lib >> $BASH_ENV
19+
20+
# Do _not_ use the CPU count returned by build/tools/proc_count.sh
21+
# for building, it is too high (36 logical CPUs) and results in
22+
# running out of memory, so limit ourselves to just 2 CPUs we're
23+
# supposed to be using in Docker Medium resource class.
24+
wxPROC_COUNT=2
25+
echo wxBUILD_ARGS=-j$wxPROC_COUNT >> $BASH_ENV
26+
27+
# Get extra conversions for iconv used by the tests and langpacks
28+
# to run the tests using the corresponding locales that would be
29+
# skipped otherwise.
30+
export WX_EXTRA_PACKAGES='ccache glibc-gconv-extra langpacks-core-de langpacks-core-en langpacks-core-fr langpacks-core-sv'
31+
./build/tools/before_install.sh
32+
33+
echo "PATH=/usr/lib64/ccache:$PATH" >> $BASH_ENV
34+
35+
- run:
36+
name: Checkout required submodules
37+
command: |
38+
git submodule update --init 3rdparty/catch 3rdparty/nanosvg
39+
40+
- restore_cache:
41+
name: Restore ccache
42+
keys:
43+
- ccache-v1-{{ arch }}-{{ .Branch }}
44+
- ccache-v1-{{ arch }}
45+
46+
- run:
47+
name: Configure
48+
command: ./configure --disable-debug-info
49+
50+
- run:
51+
name: Build libraries
52+
command: |
53+
make -k $wxBUILD_ARGS CXXFLAGS='-Werror -Wno-error=cpp'
54+
55+
- run:
56+
name: Build tests
57+
command: |
58+
make -k $wxBUILD_ARGS CXXFLAGS='-Werror -Wno-error=cpp' -C tests
59+
60+
- run:
61+
name: Run tests
62+
command: |
63+
cd tests
64+
WX_TEST_WEBREQUEST_URL="0" ./test
65+
66+
- run:
67+
name: Show ccache statistics
68+
when: always
69+
command: ccache -vv -s
70+
71+
- save_cache:
72+
name: Save ccache
73+
when: always
74+
key: ccache-v1-{{ arch }}-{{ .Branch }}-{{ .BuildNum }}
75+
paths:
76+
- ~/.cache/ccache
77+
78+
workflows:
79+
build:
80+
jobs:
81+
- build-fedora

‎wxWidgets/.cirrus.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# Continuous integration tasks running on Cirrus CI.
2+
#
3+
# This is currently used for testing under FreeBSD, which is not available at
4+
# the other CI providers used by wx.
5+
6+
env:
7+
CCACHE_SIZE: 1G
8+
CCACHE_DIR: /tmp/ccache
9+
10+
task:
11+
skip: "changesIncludeOnly('.github/**','docs/**','interface/**','include/wx/{msw,osx,qt}/**','src/{msw,osx,qt}/**')"
12+
name: Cirrus CI / FreeBSD 13 wxGTK 3
13+
freebsd_instance:
14+
image_family: freebsd-13-0
15+
16+
before_script: |
17+
echo LD_LIBRARY_PATH=`pwd`/lib >> $CIRRUS_ENV
18+
19+
wxPROC_COUNT=`./build/tools/proc_count.sh`
20+
echo wxBUILD_ARGS=-j$wxPROC_COUNT >> $CIRRUS_ENV
21+
22+
WX_EXTRA_PACKAGES='ccache git' ./build/tools/before_install.sh
23+
24+
echo "PATH=/usr/local/libexec/ccache:$PATH" >> $CIRRUS_ENV
25+
26+
# Rather than getting all submodules, get just the ones we need, as we can
27+
# use system libraries instead of the other ones.
28+
update_submodues_script: |
29+
git submodule update --init 3rdparty/catch 3rdparty/nanosvg
30+
31+
ccache_cache:
32+
folder: /tmp/ccache
33+
34+
# We need to pass flags so that libraries under /usr/local are found, because
35+
# configure doesn't look for them there by default (it ought to always use
36+
# pkg-config instead, but it currently doesn't do this neither).
37+
configure_script: |
38+
./configure --disable-optimise --disable-debug_info CXXFLAGS=-Werror CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib
39+
40+
build_library_script: |
41+
make -k $wxBUILD_ARGS
42+
43+
build_tests_script: |
44+
make -k -C tests $wxBUILD_ARGS
45+
46+
test_script: |
47+
cd tests
48+
WX_TEST_WEBREQUEST_URL="0" ./test
49+
50+
build_samples_script: |
51+
make -k -C samples $wxBUILD_ARGS
52+
53+
# Building sample requires GNU make, so install it just for this.
54+
install_script: |
55+
make install
56+
pkg install -q -y gmake
57+
gmake -C samples/minimal -f makefile.unx clean
58+
gmake -C samples/minimal -f makefile.unx $wxBUILD_ARGS
59+
60+
# Show cache statistics for information.
61+
end_script: |
62+
ccache -s

wxWidgets/misc/git/ignore_revs renamed to wxWidgets/.git-blame-ignore-revs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,24 @@
77
#
88
# git config blame.ignoreRevsFile misc/git/ignore_revs
99

10+
# Fix comment typos in sources, 2021-10-02
11+
668a2186cd89fd4576bed224df3624811eebeca1
12+
13+
# Remove all trailing spaces, 2019-01-30
14+
8fbca5cb70c8b647d5bd2cacb1e0a2a00358f351
15+
1016
# Remove (most) occurrences of wxT() macro from the samples, 2018-09-23
1117
f58ea625968953ca93585ea7f93dcc07ad032d8f
1218

1319
# Remove trailing whitespace from several files, 2018-04-11
1420
496da2e550ce1f562f727230babc363da190530e
1521

22+
# Remove all lines containing cvs/svn "$Id$" keyword.
23+
3f66f6a5b3583b02c34854556eb83e3a808524ce
24+
25+
# No changes, just removed hard tabs and trailing white space., 2009-08-21)
26+
03647350fc7cd141953c72e0284e928847d30f44
27+
1628
# Globally replace _T() with wxT()., 2009-07-23
1729
9a83f860948059b0273b5cc6d9e43fadad3ebfca
1830

‎wxWidgets/.mailmap‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ AliKet <aliket1435@gmail.com>
22
Anil Kumar <Anil.Kumar@efi.com> <anilkumar8753@gmail.com>
33
ARATA Mizuki <minorinoki@gmail.com>
44
Artur Sochirca <arturs@bricsys.com> <arturs@trac.wxwidgets.org>
5-
Artur Wieczorek <artwik@wp.pl>
5+
Artur Wieczorek <7330332+a-wi@users.noreply.github.com> <artwik@wp.pl>
66
Daniel Kulp <dan@kulp.com> <dkulp@apache.org>
77
Blake Eryx <seasweptdreams@gmail.com> <Blake-Eryx@users.noreply.github.com>
88
Bogdan Iordanescu <bogdan_iordanescu@yahoo.com>
@@ -24,6 +24,8 @@ Jouk Jansen <joukj@hrem.nano.tudelft.nl>
2424
Jose Lorenzo <josee.loren@gmail.com> <isleo11@gmail.com>
2525
Julian Smart <julian@anthemion.co.uk>
2626
Jevgenijs Protopopovs <jprotopopov1122@gmail.com>
27+
Gérard Durand <gerard-florence.durand@orange.fr>
28+
Gérard Durand <gerard-florence.durand@orange.fr> <46453025+gerard-durand@users.noreply.github.com>
2729
Hartwig Wiesmann <git@skywind.eu>
2830
<git@skywind.eu> <hartwig.wiesmann@wanadoo.nl>
2931
Kinaou Hervé <kinaouherve@gmail.com>

‎wxWidgets/3rdparty/catch/docs/tutorial.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Getting Catch
22

3-
The simplest way to get Catch is to download the latest [single header version](https://raw.githubusercontent.com/philsquared/Catch/master/single_include/catch.hpp). The single header is generated by merging a set of individual headers but it is still just normal source code in a header file.
3+
The simplest way to get Catch is to download the latest [single header version](https://github.com/philsquared/Catch/releases/download/v1.12.2/catch.hpp). The single header is generated by merging a set of individual headers but it is still just normal source code in a header file.
44

55
The full source for Catch, including test projects, documentation, and other things, is hosted on GitHub. [http://catch-lib.net](http://catch-lib.net) will redirect you there.
66

‎wxWidgets/3rdparty/catch/include/internal/catch_compiler_capabilities.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
////////////////////////////////////////////////////////////////////////////////
164164

165165
// Use variadic macros if the compiler supports them
166-
#if ( defined _MSC_VER && _MSC_VER > 1400 && !defined __EDGE__) || \
166+
#if ( defined _MSC_VER && _MSC_VER >= 1400 && !defined __EDGE__) || \
167167
( defined __WAVE__ && __WAVE_HAS_VARIADICS ) || \
168168
( defined __GNUC__ && __GNUC__ >= 3 ) || \
169169
( !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L )

‎wxWidgets/3rdparty/catch/include/internal/catch_debugger.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ namespace Catch{
2727
#define CATCH_TRAP() \
2828
__asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" \
2929
: : : "memory","r0","r3","r4" ) /* NOLINT */
30-
#elif defined(__i386__) || defined(__x86_64__)
31-
#define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
3230
#elif defined(__aarch64__)
33-
#define CATCH_TRAP() __asm__(".inst 0xd4200000")
31+
// Backport of https://github.com/catchorg/Catch2/commit/a25c1a24af8bffd35727a888a307ff0280cf9387
32+
#define CATCH_TRAP() __asm__(".inst 0xd4200000")
33+
#else
34+
#define CATCH_TRAP() __asm__("int $3\n" : : /* NOLINT */ )
3435
#endif
3536

3637
#elif defined(CATCH_PLATFORM_LINUX)

0 commit comments

Comments
 (0)