i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed build for non-Message4 again. Both BMessage::Private classes should be compatible.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15063 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2005-11-21 19:10:13 +00:00
parent 85b31e1b69
commit c919ec6862
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Window.cpp
+1 -9
View File
@@ -2228,25 +2228,17 @@ BWindow::task_looper()
} else { } else {
// Get the target handler // Get the target handler
BHandler *handler = NULL; BHandler *handler = NULL;
#ifdef USING_MESSAGE4
// Use the private BMessage accessor to determine if we are // Use the private BMessage accessor to determine if we are
// using the preferred handler, or if a target has been // using the preferred handler, or if a target has been
// specified // specified
BMessage::Private messagePrivate(fLastMessage); BMessage::Private messagePrivate(fLastMessage);
bool usePreferred = messagePrivate.UsePreferredTarget(); bool usePreferred = messagePrivate.UsePreferredTarget();
#else
bool usePreferred = _use_preferred_target_(fLastMessage);
#endif
if (usePreferred) { if (usePreferred) {
handler = PreferredHandler(); handler = PreferredHandler();
} else { } else {
#ifndef USING_MESSAGE4
gDefaultTokens.GetToken(_get_message_target_(fLastMessage),
B_HANDLER_TOKEN, (void **)&handler);
#else
gDefaultTokens.GetToken(messagePrivate.GetTarget(), gDefaultTokens.GetToken(messagePrivate.GetTarget(),
B_HANDLER_TOKEN, (void **)&handler); B_HANDLER_TOKEN, (void **)&handler);
#endif
} }
if (!usePreferred || _DistributeMessage(fLastMessage)) { if (!usePreferred || _DistributeMessage(fLastMessage)) {