hsv2/bwidgets
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

inheritance fixes

Browse source
This commit is contained in:
Andrea Blankenstijn 2021-08-17 17:59:34 +02:00
parent eb777db6dd
commit 76a8bb6140
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
inc/basic_widgets/w/base/widget.hpp
View file

@ -5,7 +5,7 @@
#include <basic_widgets/core/renderer.hpp> #include <basic_widgets/core/renderer.hpp>
#include <basic_widgets/core/type/size.hpp> #include <basic_widgets/core/type/size.hpp>
#include <basic_widgets/w/feat/event_handler_impl.hpp> #include <basic_widgets/w/feat/event_handler.hpp>
union SDL_Event; union SDL_Event;
@ -13,7 +13,7 @@ struct SDL_Renderer;
namespace bwidgets namespace bwidgets
{ {
class Widget : public virtual EventHandlerImpl class Widget : public virtual EventHandler
{ {
public: public:
Widget* parent; Widget* parent;

4
inc/basic_widgets/w/base/widget_impl.hpp
View file

@ -1,11 +1,13 @@
#ifndef BWIDGETS_WIDGET_IMPL_HPP #ifndef BWIDGETS_WIDGET_IMPL_HPP
#define BWIDGETS_WIDGET_IMPL_HPP #define BWIDGETS_WIDGET_IMPL_HPP
#include <basic_widgets/w/feat/event_handler_impl.hpp>
#include <basic_widgets/w/base/widget.hpp> #include <basic_widgets/w/base/widget.hpp>
namespace bwidgets namespace bwidgets
{ {
class WidgetImpl : public virtual Widget class WidgetImpl : public virtual Widget,
public virtual EventHandlerImpl
{ {
public: public:
void render() override; void render() override;

2
inc/basic_widgets/w/feat/keyboard_handler_impl.hpp
View file

@ -7,7 +7,7 @@
namespace bwidgets namespace bwidgets
{ {
class KeyboardHandlerImpl : public KeyboardHandler, class KeyboardHandlerImpl : virtual public KeyboardHandler,
virtual public EventHandlerImpl, virtual public EventHandlerImpl,
virtual public FocusHandlerImpl virtual public FocusHandlerImpl
{ {