Commit Graph

60583 Commits

Author SHA1 Message Date
Vadim Zeitlin
e0a175e0b8 Merge branch 'upmake'
Update upmake script itself and various upmake-related fixes.
2015-10-04 00:18:21 +02:00
Vadim Zeitlin
eae9cf1641 Put systhemectrl.{cpp,h} in alphabetic order in the MSBuild project
No real changes, just keep files a bit better organized.

See #16414.
2015-10-04 00:11:16 +02:00
Vadim Zeitlin
d22574a042 Remove wrong inclusion of systhemectrl.cpp from MSBuild project
This got somehow added in 2fff3cd29f (bug in
upmake?).

See #16414.
2015-10-04 00:11:16 +02:00
Vadim Zeitlin
a3fc5c5400 Update MSBuild wxHTML project to match the old MSVC one
The MSBuild project was not updated in c5d29608b1
so do it now, using upmake.

See #16923.
2015-10-04 00:11:16 +02:00
Vadim Zeitlin
ebd33579fd Manage VC[789] project files with upmake too
Update the old style MSVC project files for wxWidgets itself (but not the
samples etc) from upmake instead of bakefile too, as the latest upmake version
can handle them.
2015-10-04 00:11:16 +02:00
Vadim Zeitlin
2ee9e28fc2 Also update richtext MSVS project from upmake
This project was accidentally omitted from the list of projects updated by
upmake, add it too now.
2015-10-04 00:11:15 +02:00
Vadim Zeitlin
4b12516d42 Replace upmake and dependent modules with a monolithic script
Remove the Perl modules composing upmake from wxWidgets repository, it's too
difficult to maintain them both here and at https://github.com/vadz/upmake and
just keep the wxWidgets-specific upmake_script.pl here and generate
build/upmake_script itself from it using fatpack.

This also updates upmake to the latest 0.3 version, as a side effect.
2015-10-04 00:11:10 +02:00
Vadim Zeitlin
f89f7c32f2 No changes, just remove an outdated comment
The comment in wxDataViewCustomRendererBase::RenderText() referred to the code
which doesn't exist any more and so was useless and confusing, just remove it.
2015-10-04 00:01:02 +02:00
Bryan Petty
e5754d00d4 Add x64 build folders to gitignore, and general cleanup.
- Removed .DS_Store entries.
- Added demo VC builds: Unicode/Debug/DLL/Universal/x64
- Added library folders: gcc_lib32, gcc_lib64
- Added sample VC builds: x64
- Added tests VC builds: Universal/x64
- Added utils VC builds: Debug/DLL/x64

See #17175
2015-10-03 13:50:59 -06:00
Bryan Petty
9de71d0b9d Add makefile.unx to LF-only gitattributes. 2015-10-03 11:28:49 -06:00
John Roberts
bedbdb116d Fix scrolling behaviour of wxSearchCtrl under OS X
Make it behave in the same way as single line wxTextCtrls do.

See #17178.
2015-10-03 18:05:48 +02:00
Paul Cornett
beffb32d2d Avoid invalidating best size for foreground/background color change 2015-10-02 10:11:58 -07:00
Paul Cornett
3423e6533b Fix memory leak introduced in 3b047b58
Also, use memcpy() instead of strcpy() since we already have the length,
and use static_cast instead of reinterpret_cast.
2015-10-02 09:12:17 -07:00
Vadim Zeitlin
982cf92fd8 Fix wxCHB_DEFAULT description in documentation
It was apparently copy-and-pasted from wxLB_DEFAULT, but wxChoicebook doesn't
actually behave like this.
2015-09-29 00:59:32 +02:00
Vadim Zeitlin
97f260bcea Merge branch 'd2d-gcc-fixes'
Fix compilation errors and warnings in wxD2DRenderer code with g++.

Closes #16625.
2015-09-29 00:55:40 +02:00
Vadim Zeitlin
d1dfcd1497 Fix some g++ warnings in D2D graphics code
Avoid warnings about a class with virtual methods having non-virtual dtor and
not handling an enum value in a switch.

See #16625.
2015-09-29 00:54:25 +02:00
Vadim Zeitlin
2a9a42fd23 Don't pretend that we implement IWICBitmapSource::CopyPalette()
We don't and it's unclear how to do it, so just return
WINCODEC_ERR_PALETTEUNAVAILABLE instead of pretending that we copied the
palette when we didn't.

See #16625.
2015-09-29 00:49:37 +02:00
Vadim Zeitlin
576b0033c0 Fix wrong use of wxCHECK2_MSG in D2D graphics code
This was supposed to be wxCHECK_MSG().

See #16625.
2015-09-29 00:46:27 +02:00
Vadim Zeitlin
db415ad04d Compilation fixes for C++98 compilers in D2D graphics code
Don't use ">>" token in nested templates, this is not allowed in C++98 but
only C++11.

Also don't use "= NULL" on pure virtual functions.

See #16625.
2015-09-29 00:44:08 +02:00
Vadim Zeitlin
827e3d455a Build fixes for PCH-less build for D2D graphics context
Include the required headers in all cases currently, ideal would be to include
them only inside "#ifndef WX_PRECOMP" but it's probably not a big problem to
just do it always.

See #16625.
2015-09-29 00:42:26 +02:00
Joost Nieuwenhuijse
ccc94f46e0 Fix wxSlider getting disabled after changing color in wxMSW
The changes of f88585b4ab could result in
wxSlider getting disabled when its background colours was changed because
wxWindow::IsEnabled() could return false if the control was currently disabled
because its parent was disabled, for example -- but wxSlider wouldn't get
enabled back even after the parent was enabled.

Closes #12271.

Closes https://github.com/wxWidgets/wxWidgets/pull/103
2015-09-28 17:47:16 +02:00
Vadim Zeitlin
00c63cfd3a Really get rid of warnings in casts to WPARAM in wxMSW wxListCtrl
Finally really fix the problem with an explicit cast to WPARAM needed to fix
the warning for MinGW but provoking a warning with MSVC: this cast was added
in 612bbde52f, reverted in
77cfdec054 and added back in
36e5a9a7c4 and so we were back to having
warnings in MSVC 64 bit builds.

Work around them by defining NO_ITEM constant differently for MinGW and MSVC
to satisfy both of them.
2015-09-28 15:34:14 +02:00
Vadim Zeitlin
0f4e5e9e28 Suppress harmless MSVC C4324 warning in 64 bit builds
We don't care about the change of size to wx_error_mgr struct due to the use
of __declspec(align()) in libjpeg headers, so just suppress the warning.
2015-09-28 15:34:13 +02:00
Tobias Taschner
76a75ddc6a Fix text colour for items drawn using wxRenderer::DrawItemText()
After the addition and usage of DrawItemText() in
b7a89f8746 custom colors in wxDataViewCtrl where
ignored, restore the correct behavior (custom color for unselected items) by
avoiding changing the colour for the normal items in this function.

Closes #17164.
2015-09-28 15:34:12 +02:00
Tobias Taschner
44bcc3a723 Add ellipsizeMode parameter to wxRenderNative::DrawItemText()
Instead of the default end ellipsize mode used in the native and generic
implementation, allow specifying the mode with an additional parameter.

Closes https://github.com/wxWidgets/wxWidgets/pull/97
2015-09-28 15:34:08 +02:00
Tobias Taschner
60a3d76045 Fix handling of wxALIGN_CENTER in wxMSW DrawItemText()
Test for wxALIGN_CENTER_HORIZONTAL only, not wxALIGN_CENTER, when choosing the
horizontal alignment to use, as the latter includes wxALIGN_CENTER_VERTICAL
and so would wrongly center an item using wxALIGN_CENTER|wxALIGN_RIGHT
horizontally, for example.

See https://github.com/wxWidgets/wxWidgets/pull/97
2015-09-28 15:33:46 +02:00
Vadim Zeitlin
9add303f76 Move wxEllipsize{Flags,Mode} to wx/gdicmn.h
This will allow using these constants from other headers without having to
include wx/control.h.

See https://github.com/wxWidgets/wxWidgets/pull/97
2015-09-28 15:23:13 +02:00
JulianSmart
965786a0fa Suppressed double hiding/deletion of caret which can cause the caret to go missing from a different window that's currently focused 2015-09-28 14:18:34 +01:00
JulianSmart
40430585d6 Removed erroneous variable declaration 2015-09-28 14:17:21 +01:00
JulianSmart
7c7ec1b792 Block events to avoid accidental button disabling 2015-09-28 14:15:40 +01:00
Tobias Taschner
79d485d7a9 Remove dynamic loading of SetMenuInfo.
SetMenuInfo is available since Win2k
2015-09-27 19:10:50 +02:00
Tobias Taschner
27ffe525b5 Remove dynamic loading of SetLayeredWindowAttributes and FlashWindowEx.
FlashWindowEx is available since WinXP.
SetLayeredWindowAttributes is available since Win2k.
2015-09-27 19:10:49 +02:00
Tobias Taschner
bf0461bde7 Remove dynamic loading of AnimateWindow.
API is available since Win2k.
2015-09-27 19:10:49 +02:00
Tobias Taschner
f936a54000 Remove dynamic loading of Display APIs.
ChangeDisplaySettingsEx, EnumDisplayMonitors, MonitorFromPoint, MonitorFromWindow and GetMonitorInfo are available since Win2k.
2015-09-27 19:10:49 +02:00
Tobias Taschner
615b932f72 Remove dynamic loading of SHAutoComplete.
Available since Win2k.
2015-09-27 19:08:15 +02:00
Tobias Taschner
977da25524 Remove dynamic loading of AssocQueryString.
API is available since Win2k.
2015-09-27 19:08:15 +02:00
Tobias Taschner
6ef5ed8110 Remove dynamic loading of AttachConsole.
API is available since WinXP.
2015-09-27 19:08:14 +02:00
Tobias Taschner
e78be14ac1 Remove dynamic loading of version.dll.
The version info APIs GetFileVersionInfoSize, GetFileVersionInfo, VerQueryValue are available since Win2k no need to load them dynamically any more.
2015-09-27 19:08:14 +02:00
Tobias Taschner
6973f13cd1 Remove wxApp::GetShell32Version().
This method was only used for checks for Windows 9x versions of shell32.

See ticket: #17120
2015-09-27 19:08:14 +02:00
Tobias Taschner
09b23156f5 Remove outdated documentation remarks on Windows prior XP.
Since Windows XP is now the minimum supported target all remarks referencing differences in Windows versions prior XP have been removed or updated.
2015-09-27 19:07:20 +02:00
Tobias Taschner
03b243da21 Remove checks GetComCtl32Version() aimed prior WinXP.
Windows XP always has ComCtl32Version 582 available. If the executable includes a manifest version 600 is available.
2015-09-27 19:07:19 +02:00
Roger Sanders
4acb4cf476 Fix crashes in wxMSW when reinitializing the library.
Reset pointers to functions loaded from msimg32.dll when the library is
uninitialized as they may change if it's re-initialized again and msimg32.dll
is reloaded at a different address.

Also do the same thing for the function pointers from gdi32.dll for
consistency, even though it doesn't seem to be actually required in this case.

Closes #17167.
2015-09-27 12:22:37 +02:00
Bryan Petty
7c6c21c538 Bump Doxygen version used in docs. 2015-09-24 17:42:08 -06:00
Vadim Zeitlin
44472777e2 Fix dialogs title bar broken by Windows CE removal changes
Restore the code setting WS_CAPTION that was mistakenly removed in
8282c1be0f

See https://github.com/wxWidgets/wxWidgets/pull/81

Closes #17161.
2015-09-25 00:40:16 +02:00
Vadim Zeitlin
31473d5ff9 Build fix after removing DOS checks
After removing the "#if ...DOS...", the following #elif also must be adjusted.

See https://github.com/wxWidgets/wxWidgets/pull/100
2015-09-24 15:12:19 +02:00
Bogdan Iordanescu
b2c3ad614f Add support for hiding sizer items in XRC
Handle the `<hideitems>` property for sizers and document it.

Also group `minsize` together with `hideitems` in `stdSizerProperties`, which
is used by all sizer classes except `wxStdDialogButtonSizer` in the XRC
schema.
2015-09-24 14:48:11 +02:00
Tobias Taschner
42338fb5fd Fix wxUxThemeEngine on WinXP after DrawItemText() addition
The recent addition of DrawThemeTextEx in
b7a89f8746 (Add wxRendererNative::DrawItemText()
for list-like controls) broke initialization of uxtheme on WinXP as
DrawThemeEx is only available on Vista+.

Closes https://github.com/wxWidgets/wxWidgets/pull/101/
2015-09-24 14:41:42 +02:00
Tobias Taschner
2eccc1a57d Remove remaining MSDOS support code
The remaining DOS source files where already removed in
26a0a24f38. This removes the remaining __DOS__
and __DJGPP__ (the DOS gcc) code paths.

Closes https://github.com/wxWidgets/wxWidgets/pull/100
2015-09-24 14:38:22 +02:00
Vadim Zeitlin
854fce33a7 Don't disable wxUSE_CRASHREPORT in Win64 builds
Creating minidumps works in 64 bit builds since quite some time (see
603c73dbba), so there is no reason to forcefully
disable it any more.

Closes #17162.
2015-09-24 14:35:00 +02:00
Vadim Zeitlin
5846144614 Use full paths when checking for existence in wxGenericFileDialog
Use full path to the selected file before checking whether it exists,
otherwise the check could fail even if the file does exist but the current
directory is different from the one it is in.

See #16698.
2015-09-24 14:31:14 +02:00