Commit Graph

60502 Commits

Author SHA1 Message Date
Vadim Zeitlin
5cce48186c Link with shlwapi.lib and version.lib under MSW
These libraries are required now that we don't load the functions from them
dynamically (see e78be14ac1)

Closes #17180
2015-10-07 18:56:33 +02:00
Vadim Zeitlin
aa970c3da3 Remove all mentions of msevc4prj from bakefiles
Neither eVC nor wxWinCE port it was used for are supported any longer, so
simplify the bakefiles by removing the checks for it.
2015-10-07 18:14:55 +02:00
Vadim Zeitlin
bde287ba81 Rebake webview sample makefile after EXTRALIBS_WEBVIEW addition
This should have been done in d24f711f88 a year
ago but that commit only updated the makefile of the library itself and not
that of the sample.

See #16624
2015-10-07 18:14:55 +02:00
JulianSmart
ca606fb3b6 Merge branch 'master' of https://github.com/wxWidgets/wxWidgets 2015-10-07 14:41:13 +01:00
JulianSmart
5979facc48 Fixed bug in border drawing 2015-10-07 14:40:36 +01:00
Scott Mansell
c33dc4459c Fix building of wxBusyInfo with wxUSE_MARKUP disabled
Don't call SetLabelMarkup() if it's not available.

Closes https://github.com/wxWidgets/wxWidgets/pull/109
2015-10-06 13:15:31 +02:00
Tobias Taschner
6b34f39f46 Choose lighter color for wxOSX/Cocoa wxSYS_COLOUR_INFOBK.
[NSColor windowFrameColor] from commit 515fcc66e6 was way to dark [NSColor windowBackgroundColor] gives a much better contrast with the text.
2015-10-06 11:32:01 +02:00
Vadim Zeitlin
cb83c4e0de Fix wxStandardPaths compilation with gcc after recent changes
Forward declare struct _GUID to allow referencing it in this header without
including the full <windows.h> or even <guiddef.h>.

This fixes compilation with gcc after the changes of
a0fb808087

Closes https://github.com/wxWidgets/wxWidgets/pull/108
2015-10-05 00:50:01 +02:00
Tobias Taschner
614cb5abf0 Fix non PCH build and gcc warnings in wxAuiMSWTabArt
Recent de96b0dae7 commit caused these issues.

See https://github.com/wxWidgets/wxWidgets/pull/108
2015-10-05 00:34:07 +02:00
Cătălin Răceanu
5ba2943d1c Correct wxThread::Delete() default parameter documentation.
It is actually wxTHREAD_WAIT_DEFAULT and not always wxTHREAD_WAIT_BLOCK.

Closes https://github.com/wxWidgets/wxWidgets/pull/107
2015-10-05 00:31:06 +02:00
Tobias Taschner
b642747fd2 Fix right aligned text position in wxDVC on MSW with system theme
Right aligned text was one pixel off when inside selection rect.

Close #16414
2015-10-04 01:14:09 +02:00
Tobias Taschner
4ac0250f90 Fix cell selection drawing in wxDVC on MSW with system theme
Keyboard focus rect when selecting a column was nearly invisible against the
light background. Now the correct theme parts are used when drawing with UX
theme and the old behavior (white focus rect) is used everywhere else.

See #16414
2015-10-04 01:13:27 +02:00
Tobias Taschner
515fcc66e6 Reuse wxSystemSettings from wxCocoa in wxOSX/Cocoa
Use of NSColor’s various system defined color values seem to get more
appropriate colors than the carbon implementation.

Closes #17141
2015-10-04 01:09:27 +02:00
Tobias Taschner
0938141f3e Add Cocoa implementation of wxStandardPaths
Previously wxStandardPathsCF was used for all Mac builds and it used
FSFindFolder() (CoreFoundation) calls in Carbon builds, but many hard coded
values in Cocoa builds. The Cocoa implementation uses NSFileManager and
NSBundle to retrieve the folder locations from the system.

Closes https://github.com/wxWidgets/wxWidgets/pull/89
2015-10-04 01:05:57 +02:00
Tobias Taschner
a0fb808087 Add wxStandardPaths::GetUserDir() to get Desktop, Download etc
All major supported platforms have well defined per-user directories to store
Downloads, Music, Pictures, Videos and the Desktop files. The new method
wxStandardPaths::GetUserDir() allows for a unified way to access these on MSW,
OS X and Unix (if XDG user dirs specification is implemented for the latter).

See https://github.com/wxWidgets/wxWidgets/pull/89
2015-10-04 01:05:23 +02:00
IlyaBizyaev
cfe4b4fd07 Remove obsolete empty files
None of these files is used and they don't contain anything useful.

See https://github.com/wxWidgets/wxWidgets/pull/46
2015-10-04 00:57:48 +02:00
Vadim Zeitlin
02942c1b14 Merge branch 'prewinxp_cleanup' of https://github.com/TcT2k/wxWidgets
Remove the code checking for Windows versions < XP and update the documention
to not mention them any more neither.

Closes https://github.com/wxWidgets/wxWidgets/pull/82
2015-10-04 00:54:05 +02:00
Vadim Zeitlin
de96b0dae7 Implement native wxAuiTabArt for MSW
This wxAuiTabArt implementation uses Windows uxtheme API to draw AUI tabs. A
fallback to generic tab art is implemented for the bottom tabs or if uxtheme
is not available (disabled by user or no manifest file).

Closes https://github.com/wxWidgets/wxWidgets/pull/105
2015-10-04 00:28:00 +02:00
Tobias Taschner
1a8bcd4d88 Add support for mouse hover state to wxAuiTabArt
This allows wxAuiNotebook to support drawing its tabs differently depending on
whether the mouse is hovering above them or not.

See https://github.com/wxWidgets/wxWidgets/pull/105
2015-10-04 00:27:22 +02:00
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