From b816dc1ec617d0f7c9918ea86b45b50102ed6c6d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 16 Feb 2003 23:46:02 +0000 Subject: [PATCH] BDirectWindow defined new reserved virtual slots and left out virtuals defined by the R5 counterpart, which made it binary incompatible. Fixed. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2729 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/game/DirectWindow.h | 12 ++++++------ src/kits/game/DirectWindow.cpp | 29 +++++++++++------------------ 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/headers/os/game/DirectWindow.h b/headers/os/game/DirectWindow.h index 922ccf1001..393a4c6f5b 100644 --- a/headers/os/game/DirectWindow.h +++ b/headers/os/game/DirectWindow.h @@ -123,8 +123,8 @@ public: virtual status_t Perform(perform_code d, void *arg); private: - virtual void _ReservedDirectWindow1(); - virtual void _ReservedDirectWindow2(); + virtual void task_looper(); + virtual BMessage *ConvertToMessage(void *raw, int32 code); public: // BDirectWindow API @@ -139,10 +139,10 @@ private: typedef BWindow inherited; - virtual void _ReservedDirectWindow3(); - virtual void _ReservedDirectWindow4(); - virtual void _ReservedDirectWindow5(); - virtual void _ReservedDirectWindow6(); + virtual void _ReservedDirectWindow1(); + virtual void _ReservedDirectWindow2(); + virtual void _ReservedDirectWindow3(); + virtual void _ReservedDirectWindow4(); BDirectWindow(); BDirectWindow(BDirectWindow &); diff --git a/src/kits/game/DirectWindow.cpp b/src/kits/game/DirectWindow.cpp index 7d5d2bcb40..5e71004af0 100644 --- a/src/kits/game/DirectWindow.cpp +++ b/src/kits/game/DirectWindow.cpp @@ -263,12 +263,17 @@ BDirectWindow::Perform(perform_code d, } -//BMessage * -//BDirectWindow::ConvertToMessage(void *raw, -// int32 code) -//{ -// return NULL; -//} +void +BDirectWindow::task_looper() +{ + BWindow::task_looper(); +} + +BMessage * +BDirectWindow::ConvertToMessage(void *raw, int32 code) +{ + return BWindow::ConvertToMessage(raw, code); +} void @@ -330,18 +335,6 @@ BDirectWindow::_ReservedDirectWindow4() } -void -BDirectWindow::_ReservedDirectWindow5() -{ -} - - -void -BDirectWindow::_ReservedDirectWindow6() -{ -} - - /* unimplemented for protection of the user: * * BDirectWindow::BDirectWindow()