]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix wxUniv build after deriving wxStatusBar from wxControl.
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 22 Nov 2010 12:51:05 +0000 (12:51 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 22 Nov 2010 12:51:05 +0000 (12:51 +0000)
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

index 52dc440acf564057085ecc3acea3efddb7b7f2fc..2e64113113e3ed20c49348c4128eb21ddf49e9fe 100644 (file)
@@ -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(); }