Commit Graph

58675 Commits

Author SHA1 Message Date
Vadim Zeitlin
6a66c5fbde Move wx/html/forcelnk.h back to wxHTML from wxBase headers.
This partially undoes r32570 which doesn't seem necessary any more as
wx/html/forcelnk.h is only used in wxHTML since the addition of wx/link.h soon
after that revision and having it in wxBase is completely unnecessary and just
looks strange.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:21 +00:00
Vadim Zeitlin
53a0ef75c1 Update MSVC 10+ projects with upmake.
Update the files used in MSVC 10, 11 and 12 projects from the master files
list.

The main change is the removal of all headers from the core project: it
doesn't seem to make sense to have all headers, even for the completely
unrelated projects, in it and it is easier to just have the core own headers.

The only other changes are the addition of a few headers (including the .cpp
files used as headers) to the base project and the removal of the files which
are never built (but still appear in auto-generated by bakefile projects
because they could have been used in wxUniv case) in the core project.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:14 +00:00
Vadim Zeitlin
271d1e4589 Add first draft version of upmake, tool for updating makefiles.
Start moving away from files.bkl as the primary source for the files -- and
away from bakefile itself as the make/project file generator -- by storing the
list of files in a new build/files file and provide a simple build/upmake
script for updating files.bkl and the manually maintained MSVC10+ projects
from this file contents.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:09 +00:00
Vadim Zeitlin
38f55079e5 Add missing wx/msw/webview_missing.h header to MSVC 10+ webview projects.
This file was present in auto-generated VC[789] projects but was forgotten in
the manually maintained ones, add it now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:15:03 +00:00
Vadim Zeitlin
6d54670f1e Separate MSW resource files from the headers.
Use separate MSW_HDR and MSW_RSC variables instead of putting everything into
MSW_HDR: resources, such as .manifest, .bmp, .ico and .cur files, don't belong
to the headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:14:59 +00:00
Vadim Zeitlin
477fd425e4 No real changes, just use FOO_CMN_{SRC,HDR} for all libraries in files.bkl.
Make variable definitions consistent for all libraries: previously some of
them were decomposed in FOO_CMN_SRC and FOO_PLATFORM_SRC parts while others
just defined FOO_SRC directly and interpolated FOO_PLATFORM_SRC into it.

Use helper FOO_CMN_SRC for all of them now, as it will make it easier to
update them automatically (and the same thing for headers, i.e. HDR variables).

No changes to the generated project/make files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:14:56 +00:00
Vadim Zeitlin
da422ea6a3 Minor cleanup in files.bkl.
Remove duplicate file.

Remove commented out variable assignments.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 20:14:52 +00:00
Paul Cornett
0b92a2083d Fix setting client data when adding items to a sorted wxListBox, broken in r74317
closes #16290


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-26 07:30:42 +00:00
Paul Cornett
4b6c6a2fbd fix wxStaticText improperly wrapping text when initial size is fully specified, closes #16278
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-24 18:39:56 +00:00
Vadim Zeitlin
d2d7a07b7a Return wxWinVersion_[78] correctly from wxMSW wxGetWinVersion().
This is especially important because the workaround of r76152 for IFileDialog
bug under Windows Vista also applied under later Windows versions as they were
not detected correctly.

Closes #16286.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-22 20:35:50 +00:00
Vadim Zeitlin
5de9b53902 Disable another wxStopWatch test case in the build bot builds.
We can't rely on the program waking up quickly enough when running on the
(loaded) buildbot machines, better to skip this test than to have spurious
failures.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-22 15:13:16 +00:00
Vadim Zeitlin
494c9c9b0b Avoid showing the colour selection dialog twice in wxPropertyGrid.
Selecting "Custom" in a colour property cell resulted in the colour selection
dialog being shown twice if it was cancelled the first time.

Fix this by using wxPG_PROPERTY_SPECIFIC to indicate that the value is just
being queried and the user shouldn't be asked to enter it, as it is already in
the other places.

Closes #15543.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-22 14:36:00 +00:00
Vadim Zeitlin
f7f941a6c1 Fix changing individual font properties in the propgrid sample.
Fixes the bug in the sample which resulted in the UI not working as expected.

Closes #12779.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-22 14:35:55 +00:00
Vadim Zeitlin
d96fd33985 Don't destroy wxFont from its GetFaceName() in wxMSW.
wxFont::GetFaceName() could destroy the HFONT used by the font accidentally,
avoid it by not invalidating the font when caching its face name.

Closes #16273.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-22 14:35:49 +00:00
Vadim Zeitlin
2b223cdaa9 Minor fixes to wxStaticBitmap documentation.
Fix typo in the description; correct "See also" section.

Closes #16279.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-22 14:35:43 +00:00
Václav Slavík
9194902451 Fix warning in wxSimplebook::UpdateSelectedPage().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-21 07:41:15 +00:00
Robin Dunn
283636bf22 Add Get/SetDisabledBitmap methods for msw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-20 03:16:22 +00:00
Václav Slavík
ec5214c631 Add missing Language: header to locale/msw/it.po.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-19 17:27:00 +00:00
Václav Slavík
32084ab7ce Fix wxOSX warnings about unused variables.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-19 17:23:06 +00:00
Václav Slavík
7a25cf4932 Don't use the deprecated 'register' storage specifier.
It is not only useless with any modern C++ compiler, but also deprecated
in C++11.  Removing it fixes Clang warnings on the subject.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-19 17:23:02 +00:00
Stefan Csomor
1b3cba17e8 guarding against deleted 'self' during the mouse handler, setting peer ptr to NULL during destruction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-19 16:58:18 +00:00
Stefan Csomor
cea11b591e in order to get all focus set events, store field in editor and catch becomeFirstResponder there, see #14269
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-18 16:33:57 +00:00
Stefan Csomor
3ba1c7e166 allowing reentrancy on NSPanels makeResponder as in NSWindow, see #14269
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-18 13:59:09 +00:00
Stefan Csomor
e65104f198 refactoring to common code for updating selections, using common focus code, see #14269
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-18 10:46:12 +00:00
Stefan Csomor
2b99f92872 refactoring to common code for focus set and lost events, so that changes can be made a single place, see #14269
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-18 10:44:24 +00:00
Vadim Zeitlin
31b8c29fcd Fix bugs in wxEnumProperty introduced by r76562.
The compilation fixes introduced run-time fixes due to not account for the use
of NULL pointers (which are not accepted as choices cache but are accepted as
choices values, go figure).

Closes #16266.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-18 00:24:13 +00:00
Dimitri Schoolwerth
0141cbe551 Add 3 missing declarations for wxPoint2DInt non-member operator functions.
Three duplicate declarations were removed in r70493 instead of replacing them with the missing declarations.

Closes #10946.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 21:31:25 +00:00
Dimitri Schoolwerth
7f26fff6b4 Cast arguments passed to wxPoint2DInt constructor.
Cast them to wxInt32 (instead of int) as that is the type of the wxPoint2DInt members m_x and m_y.

See #10946.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 21:29:49 +00:00
Dimitri Schoolwerth
987814bb7c Fix wxPoint2DInt::operator*= and wxPoint2DInt::operator/= .
These operator functions are respectively adding and subtracting their arguments. Instead let the functions multiply and divide their arguments (like their wxPoint2DDouble counterparts were doing already).

See #10946.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 21:26:42 +00:00
Stefan Csomor
91f25e0bbd using the base class wxHAS_NATIVE_ENABLED_MANAGEMENT in cocoa disabling/enabling child windows, fixes #16232, fixes #15495
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 19:14:21 +00:00
Paul Cornett
c13a63a26a Fix wxSystemSettings::GetColour() returning transparent colors with GTK3, closes #16255
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 17:34:36 +00:00
Paul Cornett
8a78ec6b38 fix propgrid sample when WXWIN_COMPATIBILITY_3_0==0, broken in r75561
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 17:22:30 +00:00
Vadim Zeitlin
ebc6161c59 Compilation fixes to wxPropertyGrid after r76558.
We can't use _() in the static wxChar* arrays: first, because this doesn't
compile and second because if it did compile, it still wouldn't work as no
message catalogs are loaded yet when the static arrays are initialized.

Use wxTRANSLATE() instead and arrange for the strings to be translated when
they are really used. This is rather ugly and perhaps it would be better to
avoid passing untranslated labels array to the property classes but at least
the code compiles again now.

See #16266.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 13:41:27 +00:00
Vadim Zeitlin
0d54910b43 Don't use X11-only GDK functions in wxGTK/Win32 build.
Add GDK_WINDOWING_X11 checks to allow compiling wxGTK display code under
Win32.

Closes #16270.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 12:29:54 +00:00
Vadim Zeitlin
da4ca22383 Use non-deprecated pen and brush style constants in wxOSX code.
Use wx{PEN,BRUSH}STYLE_{SOLID,TRANSPARENT} instead of the old
wx{SOLID,TRANSPARENT}.

Closes #16269.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 12:29:41 +00:00
Vadim Zeitlin
a0aaf8e51b Fix recursive self-reference in wxRichTextAttr documentation.
Refer to wxTextAttr, not wxRichTextAttr itself.

Closes #16271.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 12:29:35 +00:00
Vadim Zeitlin
401957aba6 Make names of properties used in wxPropertyGrid translatable.
Use _() around these user-visible strings, not wxT().

Closes #16266.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 12:29:31 +00:00
Vadim Zeitlin
d94e807cfc Fix querying the value of wxEnumProperty in wxPropertyGridEditor.
Doing this changed the internal state of the control and resulted in the
choice not being updated.

Fix this by using wxPG_PROPERTY_SPECIFIC.

Closes #15449.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 12:29:26 +00:00
Vadim Zeitlin
268b33d8a3 Add simple font tests for the drawing unit test.
Check that DrawText() results in the expected output.

Currently the tests are disabled for non-Windows systems because of the
problem with the reference file paths there.

See #16261.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 12:29:21 +00:00
Vadim Zeitlin
a380c1e46f Add public wxDegToRad() and wxRadToDeg() functions.
Define these functions just once in wx/math.h instead of duplicating them in a
dozen of places.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 12:29:15 +00:00
Vadim Zeitlin
4d8ff19a1a Include renderer version into the platform tag in graphics context tests.
This allows to distinguish the results of the same renderer (e.g. GDI+-based
one) on the different OS versions (because GDI+ produces different results
under XP and Windows 8).

Closes #16260.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 12:29:08 +00:00
Vadim Zeitlin
898562f7d3 Make assert message in GraphicsContextDrawingTestCase more informative.
Include the paths of the files that we failed to copy.

See #16260.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 12:29:02 +00:00
Dimitri Schoolwerth
aeef5a4c29 Compilation fix for --disable-precomp-headers in combination with --disable-all-features .
Fix an error for compile step of "Linux i386 wxGTK trunk no features" buildbot by forward declaring wxWindow class.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-17 11:25:54 +00:00
Vadim Zeitlin
e9f4d80887 Remove checks for ancient gcc/MinGW versions.
Don't test for wxUSE_NORLANDER_HEADERS, this is always true since many, many
years.

Remove tests for gcc version < 3.3, notably 2.95: the minimal supported gcc
version is 3.4.

Closes #15727.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:01:35 +00:00
Vadim Zeitlin
8c7d31e615 Remove obsolete MSVC version tests.
Don't compare __VISUALC__ with versions 1200 (VC6) and earlier, such tests are
always true or always false now that we don't support VC6 any more, so just
remove them simplifying the code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:01:29 +00:00
Vadim Zeitlin
15f255cebb Remove support for Digital Mars compiler.
This compilers is not being developed any longer since many years, drop
support for it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:01:23 +00:00
Vadim Zeitlin
49b8d79c87 Remove (Open)Watcom support.
This compiler is not being developed since several years and almost certainly
can't be used to build the current wxWidgets sources anyhow, so remove all
support for it, including a lot of extremely ugly workarounds for its bugs
with template functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:01:06 +00:00
Vadim Zeitlin
36666a975f Add default argument for the overridden base class Connect() in wxHTTP.
This allows to call Connect(wxIPV4address) on a wxHTTP object, without
having to explicitly specify the second argument (this was documented as being
a Watcom-specific problem, but actually it wasn't).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:00:32 +00:00
Vadim Zeitlin
3a9237d78b Update wx/android/setup.h automatically from wx/setup_inc.h too.
Not sure if this file is actually used at all right now, but update it to
avoid discrepancies with the other setup[0].h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 13:00:29 +00:00
Vadim Zeitlin
d26187ed4e Update configure after the last commit.
Previous commit didn't include bakefile-generated update to configure,
breaking the build, fix this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-16 11:29:33 +00:00