From 4ed7b5779e5e6df814c291d026d9ad8a3ed4501c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 22 Nov 2010 12:51:05 +0000 Subject: [PATCH] Fix wxUniv build after deriving wxStatusBar from wxControl. wxUniv build was broken since the base class of wxStatusBar was changed from wxWindow to wxControl in r66226 because it derived twice from wxInputConsumer now. Fix this by simply not inheriting wxStatusBarUniv from wxInputConsumer any more, it already derives from it via wxControl now. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/univ/statusbr.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h index 52dc440acf..2e64113113 100644 --- a/include/wx/univ/statusbr.h +++ b/include/wx/univ/statusbr.h @@ -19,8 +19,7 @@ // wxStatusBarUniv: a window near the bottom of the frame used for status info // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxStatusBarUniv : public wxStatusBarBase, - public wxInputConsumer +class WXDLLIMPEXP_CORE wxStatusBarUniv : public wxStatusBarBase { public: wxStatusBarUniv() { Init(); } -- 2.47.2