From 0081bb9a960473bd1e4f4891416f401d1f50e5b8 Mon Sep 17 00:00:00 2001 From: alberth Date: Sun, 26 Jul 2009 13:19:23 +0000 Subject: (svn r16961) -Codechange: Moving some methods up in the class hierarchy to avoid code duplication. --- src/widget_type.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/widget_type.h') diff --git a/src/widget_type.h b/src/widget_type.h index 20c89e6e6..58c9c580b 100644 --- a/src/widget_type.h +++ b/src/widget_type.h @@ -182,7 +182,7 @@ public: virtual void StoreWidgets(Widget *widgets, int length, bool left_moving, bool top_moving, bool rtl) = 0; virtual NWidgetCore *GetWidgetFromPos(int x, int y) = 0; - virtual NWidgetBase *GetWidgetOfType(WidgetType tp) = 0; + virtual NWidgetBase *GetWidgetOfType(WidgetType tp); /** * Set additional space (padding) around the widget. @@ -295,6 +295,7 @@ public: inline bool IsDisabled(); void StoreWidgets(Widget *widgets, int length, bool left_moving, bool top_moving, bool rtl); + /* virtual */ NWidgetCore *GetWidgetFromPos(int x, int y); virtual Scrollbar *FindScrollbar(Window *w, bool allow_next = true) = 0; @@ -444,7 +445,6 @@ public: /* virtual */ void Draw(const Window *w); /* virtual */ void Invalidate(const Window *w) const; /* virtual */ NWidgetCore *GetWidgetFromPos(int x, int y); - /* virtual */ NWidgetBase *GetWidgetOfType(WidgetType tp); }; /** Nested widget with a child. @@ -480,8 +480,6 @@ public: /* virtual */ void SetupSmallestSize(Window *w, bool init_array); /* virtual */ void Draw(const Window *w); /* virtual */ void Invalidate(const Window *w) const; - /* virtual */ NWidgetCore *GetWidgetFromPos(int x, int y); - /* virtual */ NWidgetBase *GetWidgetOfType(WidgetType tp); /* virtual */ Scrollbar *FindScrollbar(Window *w, bool allow_next = true); static void InvalidateDimensionCache(); -- cgit v1.2.3-54-g00ecf