projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removing unnecessary - and incorrect - override, fixes #14319
[wxWidgets.git]
/
include
/
wx
/
animate.h
diff --git
a/include/wx/animate.h
b/include/wx/animate.h
index 5a0a5ad6324825efc6782199d252c53d5e18c39c..fd9ca4932022cf888481142a66228f0019fc5b2c 100644
(file)
--- a/
include/wx/animate.h
+++ b/
include/wx/animate.h
@@
-9,8
+9,8
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_ANIMATE
H_
_
-#define _WX_ANIMATE
H_
_
+#ifndef _WX_ANIMATE
_H
_
+#define _WX_ANIMATE
_H
_
#include "wx/defs.h"
#include "wx/defs.h"
@@
-21,17
+21,17
@@
#include "wx/timer.h"
#include "wx/bitmap.h"
#include "wx/timer.h"
#include "wx/bitmap.h"
-class WXDLLIMPEXP_ADV wxAnimation;
+class WXDLLIMPEXP_
FWD_
ADV wxAnimation;
extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation;
extern WXDLLIMPEXP_DATA_ADV(wxAnimation) wxNullAnimation;
-extern WXDLLIMPEXP_DATA_ADV(const
wxC
har) wxAnimationCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const
c
har) wxAnimationCtrlNameStr[];
// ----------------------------------------------------------------------------
// wxAnimationBase
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxAnimationBase
// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_ADV wxAnimationBase : public wx
GDI
Object
+class WXDLLIMPEXP_ADV wxAnimationBase : public wxObject
{
public:
wxAnimationBase() {}
{
public:
wxAnimationBase() {}
@@
-39,14
+39,16
@@
public:
virtual bool IsOk() const = 0;
// can be -1
virtual bool IsOk() const = 0;
// can be -1
- virtual int GetDelay(
size_t i
) const = 0;
+ virtual int GetDelay(
unsigned int frame
) const = 0;
- virtual
size_
t GetFrameCount() const = 0;
- virtual wxImage GetFrame(
size_t i
) const = 0;
+ virtual
unsigned in
t GetFrameCount() const = 0;
+ virtual wxImage GetFrame(
unsigned int frame
) const = 0;
virtual wxSize GetSize() const = 0;
virtual wxSize GetSize() const = 0;
- virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
- virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
+ virtual bool LoadFile(const wxString& name,
+ wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
+ virtual bool Load(wxInputStream& stream,
+ wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
protected:
DECLARE_ABSTRACT_CLASS(wxAnimationBase)
protected:
DECLARE_ABSTRACT_CLASS(wxAnimationBase)
@@
-63,16
+65,18
@@
protected:
// default style does not include wxAC_NO_AUTORESIZE, that is, the control
// auto-resizes by default to fit the new animation when SetAnimation() is called
// default style does not include wxAC_NO_AUTORESIZE, that is, the control
// auto-resizes by default to fit the new animation when SetAnimation() is called
-#define wxAC_DEFAULT_STYLE (wx
NO_BORDER
)
+#define wxAC_DEFAULT_STYLE (wx
BORDER_NONE
)
class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl
{
public:
class WXDLLIMPEXP_ADV wxAnimationCtrlBase : public wxControl
{
public:
- wxAnimationCtrlBase() {}
+ wxAnimationCtrlBase() {
}
-public: // public API
-
- virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
+ // public API
+ virtual bool LoadFile(const wxString& filename,
+ wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
+ virtual bool Load(wxInputStream& stream,
+ wxAnimationType type = wxANIMATION_TYPE_ANY) = 0;
virtual void SetAnimation(const wxAnimation &anim) = 0;
virtual wxAnimation GetAnimation() const = 0;
virtual void SetAnimation(const wxAnimation &anim) = 0;
virtual wxAnimation GetAnimation() const = 0;
@@
-117,6
+121,6
@@
private:
#include "wx/generic/animate.h"
#endif
#include "wx/generic/animate.h"
#endif
-#endif
// wxUSE_ANIMATIONCTRL
+#endif // wxUSE_ANIMATIONCTRL
-#endif // _WX_ANIMATE
H_
_
+#endif // _WX_ANIMATE
_H
_