Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
68,420 Commits 1 Branch 330 Tags
f72f2bec3a128685af41c02d35443bcc7b426f5b
Commit Graph

47 Commits

Author SHA1 Message Date
Maarten Bent
9039340da9 Revert default-member changes, only keep and use wxHAS_MEMBER_DEFAULT 2020-04-13 19:44:04 +02:00
Maarten Bent
1448b210b8 Use macros to define default copy constructor and assignment operator 2020-04-13 17:46:32 +02:00
Vadim Zeitlin
413fdfbfa4 Merge branch 'cmake-c++11-stl' of git://github.com/MaartenBent/wxWidgets 
CMake: Improve STL checks, improve C++17/20 support.

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

Closes #18718.
 2020-04-12 16:37:57 +02:00
Vadim Zeitlin
ed077e17cf Restore wxAnimation::GetFrame() constness 
This got lost, almost surely accidentally, in 706c8e8ad6 (Merge branch
'disable-native-animation', 2020-04-07), so just restore it now.

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

Closes #18725.
 2020-04-12 16:36:34 +02:00
Maarten Bent
52ef7157e7 Define wxMEMBER_DEFAULT similarly to the existing wxOVERRIDE 
Also define wxHAS_MEMBER_DEFAULT allowing to check if '= default' is supported
(compilers that define c++11 and VS2015 and later).
 2020-04-10 00:51:14 +02:00
Paul Cornett
902a2f0885 Remove wxAnimation copy ctor and copy-assignment operator implementations 
The compiler-generated defaults will do the same thing
 2020-04-06 20:26:49 -07:00
Vadim Zeitlin
f2ed3a5376 Add static wxAnimationCtrl::CreateCompatibleAnimation() 
This may be more convenient to use than CreateAnimation() if there is no
wxAnimationCtrl object at hand.
 2020-04-06 23:33:07 +02:00
Vadim Zeitlin
a5b5573ee1 Restore lost check for __WXUNIVERSAL__ in wx/animate.h 
Don't use native version when building wxUniv.
 2020-04-06 01:28:01 +02:00
Vadim Zeitlin
d9b1ca54ca Stop deriving native wxGTK wxAnimationCtrl from generic one 
This is unnecessary and confusing.
 2020-04-06 01:09:36 +02:00
Vadim Zeitlin
3678d67f92 Move wxGenericAnimationCtrl::m_animation to the base class 
API of wxAnimationCtrlBase practically forces the derived classes to
have such method, so just add it and make GetAnimation() a simple
non-virtual accessor.
 2020-04-06 01:03:39 +02:00
Vadim Zeitlin
b08db49bf6 Make wxAnimationImpl private and get rid of wxAnimationImplType 
Simplify and streamline animation classes relationship: wxAnimation is
the only public class representing an animation and it can be created by
both the native wxAnimationCtrl and wxGenericAnimationCtrl using the new
public CreateAnimation() method.

Replace wxAnimationImplType enum with more flexible type info based
check.
 2020-04-06 01:00:15 +02:00
Vadim Zeitlin
86d6cb8d1f Don't derive wxAnimationImpl from wxObject 
This is just unnecessary and having wxAnimation::m_refData->m_refData is
confusing, both in wxGTK version where it's not used and in the generic
one where it is, but can be replaced by more type-safe m_decoder.
 2020-04-06 00:00:10 +02:00
Vadim Zeitlin
1bf48dfe29 Remove wxAnimationCtrlBase from wxRTTI 
This is consistent with the other wxFooBase classes which are not part
of it, as they're considered implementation details and not parts of the
API.
 2020-04-05 17:01:37 +02:00
Vadim Zeitlin
d0371d75f7 Define wxHAS_NATIVE_ANIMATIONCTRL 
This allows to easily test for the native control existence and also
whether wxGenericAnimationCtrl is really different from wxAnimationCtrl.

It also allows to avoid explicit check for wxGTK in common code.
 2020-04-05 16:56:58 +02:00
Vadim Zeitlin
cdff0bc1db Use WXDLLIMPEXP_CORE instead of WXDLLIMPEXP_ADV in new code 
They're the same thing, and we still keep WXDLLIMPEXP_ADV in the
existing code, but as this line was just moved to a new place, update it
to use the more appropriate DLL export declaration too.

No real changes.
 2020-04-05 16:04:50 +02:00
Robin Dunn
e258a9d982 Move the animation Impl classes to private headers 2020-04-03 13:22:35 -07:00
Robin Dunn
4545d93924 Move wxAnimationDecoderList-related methods to wxAnimation 2020-04-03 12:49:15 -07:00
Robin Dunn
784f330838 Add assignment operator to wxAnimation 2020-04-02 14:35:30 -07:00
Robin Dunn
8153605cf0 No need for wxRTTI in wxAnimationImpl 2020-04-02 13:48:53 -07:00
Robin Dunn
52d4bad3df Apply suggestions from code review 
Co-Authored-By: VZ <vadim@wxwidgets.org>
 2020-04-02 12:35:58 -07:00
Robin Dunn
085f08aefe Remove the generic-specific methods from the wxAnimation API 2020-04-01 13:30:49 -07:00
Robin Dunn
606f365ea3 Verify the animation impl type matches the animation ctrl type 2020-04-01 12:39:48 -07:00
Robin Dunn
e464453073 * Switch wxAnimation to be a facade over a wxAnimationImpl class. 
* Implement wxAnimationGenericImpl
* Update wxGenericAnimationCtrl as needed
 2020-04-01 11:53:19 -07:00
Robin Dunn
85bd16fb06 Trim trailing whitespace 2020-03-31 14:02:39 -07:00
Robin Dunn
1608fde659 Add a Create method to the shim class 2020-03-30 15:20:19 -07:00
Robin Dunn
a7f9d5e3c5 * Switch back to using an wxAnimationBase class 
* Change the [GS]etAnimation methods to be non-virtual so they can use generic/native types of animation obj
 2020-03-30 14:53:11 -07:00
Robin Dunn
08ac4dbad6 Name the base animation class wxGenericAnimation with a wxAnimation shim class 2020-03-27 15:53:03 -07:00
Robin Dunn
488084c2f5 Name the base animation class wxGenericAnimation with a wxAnimation shim class 2020-03-27 14:33:11 -07:00
Robin Dunn
fae15d39a6 * Rename the generic version as wxGenericAnimationCtrl 
* Add a simple shim class for the generic wxAnimationCtrl
* Use the generic wxAnimation as the base class (this will probably change...)
 2020-03-25 16:29:34 -07:00
Robin Dunn
398b178431 Compile native or generic animation classes based on wxUSE flags 2020-03-24 14:49:03 -07:00
Vadim Zeitlin
3ffa651a34 Move wxAdv library contents into wxCore 
This basically removes the "adv" library, even though it's still
preserved for compatibility with user make/project files referring to
it.

It is done because the distinction between "adv" and "core" was never
really clear (e.g. why wxTreeCtrl was in core but wxTreeListCtrl in
adv?) and it prevented some core classes from using adv ones.
 2018-08-27 21:13:04 +02:00
Dimitri Schoolwerth
8f8d58d193 Use wx-prefixed macros throughout the repository. 
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
 2015-04-23 22:00:35 +04:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword. 
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-07-26 16:02:46 +00:00
Francesco Montorsi
23318a5358 declare all NameStr[] strings as const char using the correct WXDLLIMPEXP_DATA_ macros; in the process, change wxPropGrid window classes to take 'const wxString& name' arguments instead of 'const wxChar *name' 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-11-02 22:16:14 +00:00
Vadim Zeitlin
462167a9f7 allow loading wxAnimationCtrl contents from stream (patch 1962344) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-05-17 22:51:52 +00:00
Francesco Montorsi
2fd0ada578 final fixes to [a-b]*h headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-27 21:14:31 +00:00
Vadim Zeitlin
8f884a0dcc Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added 
wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all
ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-12-15 17:54:20 +00:00
Václav Slavík
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-09 10:09:52 +00:00
Vadim Zeitlin
870cf35c45 replaced size_t with unsigned int in wxAnimation and related classes and a couple of minor cleanups (use C++ comments; wrap long lines; put private parts after the public ones) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-12-10 14:18:37 +00:00
Robert Roebling
1bd2ceb57b [ 1598659 ] make wxAnimationCtrl::SetInactiveBitmap center given bitmap 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-18 17:46:29 +00:00
Vadim Zeitlin
580ca0a4e1 wxAnimationCtrl fix to display inactive bitmap at start (patch 1590192) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-03 22:16:51 +00:00
Robert Roebling
8e458bb539 [ 1580776 ] wxAnimationCtrl::SetInactiveBitmap 
Additionally call UnShare() in it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-21 13:51:38 +00:00
Paul Cornett
5f8047a69b use generic wxAnimationCtrl in wxGTK-universal 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-18 03:32:52 +00:00
Robert Roebling
fe37cbd46f Use native version of wxAnimateCtrl only for 
GTK >= 2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-11 17:59:40 +00:00
Paul Cornett
c2f12218ce wxAnimationCtrl cleanup 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-10 04:27:54 +00:00
Robin Dunn
943d32e1c6 DLL build fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-09 23:13:45 +00:00
Vadim Zeitlin
72045d5768 added wxAnimationCtrl (patch 1570325) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-09 17:51:07 +00:00