inheritance fixes
This commit is contained in:
parent
eb777db6dd
commit
76a8bb6140
|
@ -5,7 +5,7 @@
|
|||
|
||||
#include <basic_widgets/core/renderer.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;
|
||||
|
||||
|
@ -13,7 +13,7 @@ struct SDL_Renderer;
|
|||
|
||||
namespace bwidgets
|
||||
{
|
||||
class Widget : public virtual EventHandlerImpl
|
||||
class Widget : public virtual EventHandler
|
||||
{
|
||||
public:
|
||||
Widget* parent;
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
#ifndef 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>
|
||||
|
||||
namespace bwidgets
|
||||
{
|
||||
class WidgetImpl : public virtual Widget
|
||||
class WidgetImpl : public virtual Widget,
|
||||
public virtual EventHandlerImpl
|
||||
{
|
||||
public:
|
||||
void render() override;
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
namespace bwidgets
|
||||
{
|
||||
class KeyboardHandlerImpl : public KeyboardHandler,
|
||||
class KeyboardHandlerImpl : virtual public KeyboardHandler,
|
||||
virtual public EventHandlerImpl,
|
||||
virtual public FocusHandlerImpl
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue