Skip to content

Commit 9c44b4e

Browse files
author
Koen Deforche
committed
Several changes:
 - Fixed disableFollowCurve() not working (issue #4899) - Fixed possible race condition when resetting impl_ of HTTP Client - Fix overspan handling not generating compact sizes in some cases (/topics/12359) - WTemplateFormView: consistenly return a WWidget in createFormWidget() - Implemented #4875: Flags for deferred/XHTML tooltips - WCartesianChart tooltips: don't remove if mouse over tooltip, hide delay - WTemplate documentation clarification: ownership - Compile fix in http server with certain defines combo - Chart::WCartesianChart: Properly use transforms for mapToDevice/mapFromDevice - Several fixes for skia build - Fix issue #4849 Centimeter WLength to setRownHeight makes WTableView crash when scrolling - Implemented #4777 sync scroll state
1 parent 2fad170 commit 9c44b4e

Some content is hidden

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

47 files changed

+875
-278
lines changed

‎cmake/WtFindSkia.txt‎

Lines changed: 114 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ FIND_PATH(SKIA_BASE_INCLUDE_DIR
1616

1717
IF(SKIA_BASE_INCLUDE_DIR)
1818
SET(SKIA_INCLUDE_DIRS
19+
${SKIA_BASE_INCLUDE_DIR}/codec
1920
${SKIA_BASE_INCLUDE_DIR}/core
2021
${SKIA_BASE_INCLUDE_DIR}/config
2122
${SKIA_BASE_INCLUDE_DIR}/images
@@ -36,31 +37,54 @@ SET(SKIA_RELEASE
3637
${SKIA_PREFIX}/out/Release/obj/gyp
3738
${SKIA_PREFIX}/out/Release
3839
)
39-
FIND_LIBRARY(SKIA_CORE_LIB_D NAMES skia_core PATHS ${SKIA_DEBUG})
40-
FIND_LIBRARY(SKIA_PORTS_LIB_D NAMES skia_ports PATHS ${SKIA_DEBUG})
41-
FIND_LIBRARY(SKIA_OPTS_LIB_D NAMES skia_opts PATHS ${SKIA_DEBUG})
42-
FIND_LIBRARY(SKIA_IMAGES_LIB_D NAMES skia_images PATHS ${SKIA_DEBUG})
43-
FIND_LIBRARY(SKIA_UTILS_LIB_D NAMES skia_utils PATHS ${SKIA_DEBUG})
44-
FIND_LIBRARY(SKIA_OPTS_SSSE3_LIB_D NAMES skia_opts_ssse3 PATHS ${SKIA_DEBUG})
45-
FIND_LIBRARY(SKIA_OPTS_SSE41_LIB_D NAMES skia_opts_sse41 PATHS ${SKIA_DEBUG})
46-
FIND_LIBRARY(SKIA_EFFECTS_LIB_D NAMES skia_effects PATHS ${SKIA_DEBUG})
47-
FIND_LIBRARY(SKIA_SFNT_LIB_D NAMES skia_sfnt PATHS ${SKIA_DEBUG})
48-
FIND_LIBRARY(SKIA_SKGPU_LIB_D NAMES skia_skgpu PATHS ${SKIA_DEBUG})
49-
FIND_LIBRARY(SKIA_ETC1_LIB_D NAMES libetc1 PATHS ${SKIA_DEBUG})
50-
FIND_LIBRARY(SKIA_SKKTX_LIB_D NAMES libSkKTX PATHS ${SKIA_DEBUG})
40+
FIND_LIBRARY(SKIA_CORE_LIB_D NAMES skia_core PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
41+
FIND_LIBRARY(SKIA_PORTS_LIB_D NAMES skia_ports PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
42+
FIND_LIBRARY(SKIA_OPTS_LIB_D NAMES skia_opts PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
43+
FIND_LIBRARY(SKIA_IMAGES_LIB_D NAMES skia_images PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
44+
FIND_LIBRARY(SKIA_UTILS_LIB_D NAMES skia_utils PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
45+
FIND_LIBRARY(SKIA_OPTS_SSSE3_LIB_D NAMES skia_opts_ssse3 PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
46+
FIND_LIBRARY(SKIA_OPTS_SSE41_LIB_D NAMES skia_opts_sse41 PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
47+
FIND_LIBRARY(SKIA_EFFECTS_LIB_D NAMES skia_effects PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
48+
FIND_LIBRARY(SKIA_SFNT_LIB_D NAMES skia_sfnt PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
49+
FIND_LIBRARY(SKIA_SKGPU_LIB_D NAMES skia_skgpu PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
50+
FIND_LIBRARY(SKIA_ETC1_LIB_D NAMES libetc1 PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
51+
FIND_LIBRARY(SKIA_SKKTX_LIB_D NAMES libSkKTX PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
52+
FIND_LIBRARY(SKIA_CODEC_LIB_D NAMES skia_codec PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
53+
FIND_LIBRARY(SKIA_RAW_CODEC_LIB_D NAMES raw_codec PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
54+
FIND_LIBRARY(SKIA_PNG_LIB_D NAMES libpng_static PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
55+
FIND_LIBRARY(SKIA_JPG_LIB_D NAMES libjpeg-turbo PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
56+
FIND_LIBRARY(SKIA_GIF_LIB_D NAMES giflib PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
57+
FIND_LIBRARY(SKIA_WEBP_DEC_LIB_D NAMES libwebp_dec PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
58+
FIND_LIBRARY(SKIA_WEBP_UTILS_LIB_D NAMES libwebp_utils PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
59+
FIND_LIBRARY(SKIA_WEBP_DSP_LIB_D NAMES libwebp_dsp PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
60+
FIND_LIBRARY(SKIA_DNG_SDK_LIB_D NAMES dng_sdk PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
61+
FIND_LIBRARY(SKIA_ZLIB_LIB_D NAMES zlib PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
62+
FIND_LIBRARY(SKIA_PIEX_LIB_D NAMES piex PATHS ${SKIA_DEBUG} NO_DEFAULT_PATH)
5163

52-
FIND_LIBRARY(SKIA_CORE_LIB_R NAMES skia_core PATHS ${SKIA_RELEASE})
53-
FIND_LIBRARY(SKIA_PORTS_LIB_R NAMES skia_ports PATHS ${SKIA_RELEASE})
54-
FIND_LIBRARY(SKIA_OPTS_LIB_R NAMES skia_opts PATHS ${SKIA_RELEASE})
55-
FIND_LIBRARY(SKIA_IMAGES_LIB_R NAMES skia_images PATHS ${SKIA_RELEASE})
56-
FIND_LIBRARY(SKIA_UTILS_LIB_R NAMES skia_utils PATHS ${SKIA_RELEASE})
57-
FIND_LIBRARY(SKIA_OPTS_SSSE3_LIB_R NAMES skia_opts_ssse3 PATHS ${SKIA_RELEASE})
58-
FIND_LIBRARY(SKIA_OPTS_SSE41_LIB_R NAMES skia_opts_sse41 PATHS ${SKIA_RELEASE})
59-
FIND_LIBRARY(SKIA_EFFECTS_LIB_R NAMES skia_effects PATHS ${SKIA_RELEASE})
60-
FIND_LIBRARY(SKIA_SFNT_LIB_R NAMES skia_sfnt PATHS ${SKIA_RELEASE})
61-
FIND_LIBRARY(SKIA_SKGPU_LIB_R NAMES skia_skgpu PATHS ${SKIA_RELEASE})
62-
FIND_LIBRARY(SKIA_ETC1_LIB_R NAMES libetc1 PATHS ${SKIA_RELEASE})
63-
FIND_LIBRARY(SKIA_SKKTX_LIB_R NAMES libSkKTX PATHS ${SKIA_RELEASE})
64+
65+
FIND_LIBRARY(SKIA_CORE_LIB_R NAMES skia_core PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
66+
FIND_LIBRARY(SKIA_PORTS_LIB_R NAMES skia_ports PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
67+
FIND_LIBRARY(SKIA_OPTS_LIB_R NAMES skia_opts PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
68+
FIND_LIBRARY(SKIA_IMAGES_LIB_R NAMES skia_images PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
69+
FIND_LIBRARY(SKIA_UTILS_LIB_R NAMES skia_utils PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
70+
FIND_LIBRARY(SKIA_OPTS_SSSE3_LIB_R NAMES skia_opts_ssse3 PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
71+
FIND_LIBRARY(SKIA_OPTS_SSE41_LIB_R NAMES skia_opts_sse41 PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
72+
FIND_LIBRARY(SKIA_EFFECTS_LIB_R NAMES skia_effects PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
73+
FIND_LIBRARY(SKIA_SFNT_LIB_R NAMES skia_sfnt PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
74+
FIND_LIBRARY(SKIA_SKGPU_LIB_R NAMES skia_skgpu PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
75+
FIND_LIBRARY(SKIA_ETC1_LIB_R NAMES libetc1 PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
76+
FIND_LIBRARY(SKIA_SKKTX_LIB_R NAMES libSkKTX PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
77+
FIND_LIBRARY(SKIA_CODEC_LIB_R NAMES skia_codec PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
78+
FIND_LIBRARY(SKIA_RAW_CODEC_LIB_R NAMES raw_codec PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
79+
FIND_LIBRARY(SKIA_PNG_LIB_R NAMES libpng_static PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
80+
FIND_LIBRARY(SKIA_JPG_LIB_R NAMES libjpeg-turbo PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
81+
FIND_LIBRARY(SKIA_GIF_LIB_R NAMES giflib PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
82+
FIND_LIBRARY(SKIA_WEBP_DEC_LIB_R NAMES libwebp_dec PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
83+
FIND_LIBRARY(SKIA_WEBP_UTILS_LIB_R NAMES libwebp_utils PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
84+
FIND_LIBRARY(SKIA_WEBP_DSP_LIB_R NAMES libwebp_dsp PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
85+
FIND_LIBRARY(SKIA_DNG_SDK_LIB_R NAMES dng_sdk PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
86+
FIND_LIBRARY(SKIA_ZLIB_LIB_R NAMES zlib PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
87+
FIND_LIBRARY(SKIA_PIEX_LIB_R NAMES piex PATHS ${SKIA_RELEASE} NO_DEFAULT_PATH)
6488

6589
IF(WIN32)
6690

@@ -108,6 +132,72 @@ IF(WIN32)
108132
debug ${SKIA_SKKTX_LIB_D}
109133
)
110134
ENDIF(SKIA_SKKTX_LIB_D AND SKIA_SKKTX_LIB_R)
135+
IF(SKIA_CODEC_LIB_D AND SKIA_CODEC_LIB_R)
136+
SET(SKIA_LIBRARIES ${SKIA_LIBRARIES}
137+
optimized ${SKIA_CODEC_LIB_R}
138+
debug ${SKIA_CODEC_LIB_D}
139+
)
140+
ENDIF(SKIA_CODEC_LIB_D AND SKIA_CODEC_LIB_R)
141+
IF(SKIA_RAW_CODEC_LIB_D AND SKIA_RAW_CODEC_LIB_R)
142+
SET(SKIA_LIBRARIES ${SKIA_LIBRARIES}
143+
optimized ${SKIA_RAW_CODEC_LIB_R}
144+
debug ${SKIA_RAW_CODEC_LIB_D}
145+
)
146+
ENDIF(SKIA_RAW_CODEC_LIB_D AND SKIA_RAW_CODEC_LIB_R)
147+
IF(SKIA_PNG_LIB_D AND SKIA_PNG_LIB_R)
148+
SET(SKIA_LIBRARIES ${SKIA_LIBRARIES}
149+
optimized ${SKIA_PNG_LIB_R}
150+
debug ${SKIA_PNG_LIB_D}
151+
)
152+
ENDIF(SKIA_PNG_LIB_D AND SKIA_PNG_LIB_R)
153+
IF(SKIA_JPG_LIB_D AND SKIA_JPG_LIB_R)
154+
SET(SKIA_LIBRARIES ${SKIA_LIBRARIES}
155+
optimized ${SKIA_JPG_LIB_R}
156+
debug ${SKIA_JPG_LIB_D}
157+
)
158+
ENDIF(SKIA_JPG_LIB_D AND SKIA_JPG_LIB_R)
159+
IF(SKIA_GIF_LIB_D AND SKIA_GIF_LIB_R)
160+
SET(SKIA_LIBRARIES ${SKIA_LIBRARIES}
161+
optimized ${SKIA_GIF_LIB_R}
162+
debug ${SKIA_GIF_LIB_D}
163+
)
164+
ENDIF(SKIA_GIF_LIB_D AND SKIA_GIF_LIB_R)
165+
IF(SKIA_WEBP_DEC_LIB_D AND SKIA_WEBP_DEC_LIB_R)
166+
SET(SKIA_LIBRARIES ${SKIA_LIBRARIES}
167+
optimized ${SKIA_WEBP_DEC_LIB_R}
168+
debug ${SKIA_WEBP_DEC_LIB_D}
169+
)
170+
ENDIF(SKIA_WEBP_DEC_LIB_D AND SKIA_WEBP_DEC_LIB_R)
171+
IF(SKIA_WEBP_UTILS_LIB_D AND SKIA_WEBP_UTILS_LIB_R)
172+
SET(SKIA_LIBRARIES ${SKIA_LIBRARIES}
173+
optimized ${SKIA_WEBP_UTILS_LIB_R}
174+
debug ${SKIA_WEBP_UTILS_LIB_D}
175+
)
176+
ENDIF(SKIA_WEBP_UTILS_LIB_D AND SKIA_WEBP_UTILS_LIB_R)
177+
IF(SKIA_WEBP_DSP_LIB_D AND SKIA_WEBP_DSP_LIB_R)
178+
SET(SKIA_LIBRARIES ${SKIA_LIBRARIES}
179+
optimized ${SKIA_WEBP_DSP_LIB_R}
180+
debug ${SKIA_WEBP_DSP_LIB_D}
181+
)
182+
ENDIF(SKIA_WEBP_DSP_LIB_D AND SKIA_WEBP_DSP_LIB_R)
183+
IF(SKIA_DNG_SDK_LIB_D AND SKIA_DNG_SDK_LIB_R)
184+
SET(SKIA_LIBRARIES ${SKIA_LIBRARIES}
185+
optimized ${SKIA_DNG_SDK_LIB_R}
186+
debug ${SKIA_DNG_SDK_LIB_D}
187+
)
188+
ENDIF(SKIA_DNG_SDK_LIB_D AND SKIA_DNG_SDK_LIB_R)
189+
IF(SKIA_ZLIB_LIB_D AND SKIA_ZLIB_LIB_R)
190+
SET(SKIA_LIBRARIES ${SKIA_LIBRARIES}
191+
optimized ${SKIA_ZLIB_LIB_R}
192+
debug ${SKIA_ZLIB_LIB_D}
193+
)
194+
ENDIF(SKIA_ZLIB_LIB_D AND SKIA_ZLIB_LIB_R)
195+
IF(SKIA_PIEX_LIB_D AND SKIA_PIEX_LIB_R)
196+
SET(SKIA_LIBRARIES ${SKIA_LIBRARIES}
197+
optimized ${SKIA_PIEX_LIB_R}
198+
debug ${SKIA_PIEX_LIB_D}
199+
)
200+
ENDIF(SKIA_PIEX_LIB_D AND SKIA_PIEX_LIB_R)
111201
ENDIF(SKIA_BASE_INCLUDE_DIR AND SKIA_CORE_LIB_R AND SKIA_CORE_LIB_D)
112202
ELSEIF(APPLE)
113203
IF(SKIA_BASE_INCLUDE_DIR AND SKIA_CORE_LIB_R)

‎examples/widgetgallery/examples/PieChart.cpp‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,20 @@ namespace {
1717
}
1818

1919
virtual void setData(const boost::any &data, int role = Wt::UserRole) {
20-
boost::any dt;
20+
if (role == Wt::EditRole) {
21+
boost::any dt;
2122

22-
if (role == Wt::EditRole) {
23-
double d = Wt::asNumber(data);
23+
double d = Wt::asNumber(data);
2424

25-
if (d != d)
26-
dt = data;
27-
else
28-
dt = boost::any(d);
29-
}
25+
if (d != d)
26+
dt = data;
27+
else
28+
dt = boost::any(d);
29+
Wt::WStandardItem::setData(dt, role);
3030

31-
Wt::WStandardItem::setData(dt, role);
31+
} else {
32+
Wt::WStandardItem::setData(data, role);
33+
}
3234
}
3335
};
3436
}

‎examples/wt-homepage/wt-home.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -906,8 +906,10 @@ can be used only in conjunction with a Commercial License for Wt::Dbo.
906906
If you are looking to use Wt using <b>MSVC on Windows platforms</b>,
907907
then you can save yourself some hassle to build Wt with its optional
908908
dependencies from source, and download one of the <a
909-
href="http://sourceforge.net/projects/witty/files/wt/">binary builds
910-
instead</a> which allow you to quickly experiment with the examples
909+
href="https://github.com/kdeforche/wt/releases">binary builds
910+
instead</a> (<a
911+
href="http://sourceforge.net/projects/witty/files/wt/">old releases</a>)
912+
which allow you to quickly experiment with the examples
911913
that ship with Wt.
912914
</p>
913915

‎resources/form.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
text-align: right;
5050
}
5151

52-
.Wt-form .Wt-fields input {
52+
.Wt-form .Wt-fields input, .Wt-form .Wt-fields select{
5353
float: left;
5454
padding: 5px 2px;
5555
border: solid 1px #aacfe4;

‎src/Wt/Auth/AuthWidget‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ protected:
349349
*/
350350
virtual RegistrationModel *createRegistrationModel();
351351

352-
virtual WFormWidget *createFormWidget(AuthModel::Field field);
352+
virtual WWidget *createFormWidget(AuthModel::Field field);
353353

354354
virtual void render(WFlags<RenderFlag> flags);
355355

‎src/Wt/Auth/AuthWidget.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ void AuthWidget::createPasswordLoginView()
329329
updatePasswordLoginView();
330330
}
331331

332-
WFormWidget *AuthWidget::createFormWidget(WFormModel::Field field)
332+
WWidget *AuthWidget::createFormWidget(WFormModel::Field field)
333333
{
334334
WFormWidget *result = 0;
335335

‎src/Wt/Auth/RegistrationWidget‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ protected:
9797
virtual void render(WFlags<RenderFlag> flags);
9898

9999
protected:
100-
virtual WFormWidget *createFormWidget(RegistrationModel::Field field);
100+
virtual WWidget *createFormWidget(RegistrationModel::Field field);
101101

102102
private:
103103
AuthWidget *authWidget_;

‎src/Wt/Auth/RegistrationWidget.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void RegistrationWidget::render(WFlags<RenderFlag> flags)
5959
WTemplateFormView::render(flags);
6060
}
6161

62-
WFormWidget *RegistrationWidget::createFormWidget(WFormModel::Field field)
62+
WWidget *RegistrationWidget::createFormWidget(WFormModel::Field field)
6363
{
6464
WFormWidget *result = 0;
6565

‎src/Wt/Auth/UpdatePasswordWidget‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public:
4141
AuthModel *authModel, WContainerWidget *parent = 0);
4242

4343
protected:
44-
virtual WFormWidget *createFormWidget(WFormModel::Field field);
44+
virtual WWidget *createFormWidget(WFormModel::Field field);
4545

4646
private:
4747
User user_;

‎src/Wt/Auth/UpdatePasswordWidget.C‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ UpdatePasswordWidget::UpdatePasswordWidget(const User& user,
8787

8888
}
8989

90-
WFormWidget *UpdatePasswordWidget::createFormWidget(WFormModel::Field field)
90+
WWidget *UpdatePasswordWidget::createFormWidget(WFormModel::Field field)
9191
{
9292
WFormWidget *result = 0;
9393

0 commit comments

Comments
 (0)