From b1932be19b38267566dd67ae9528e3526f590c21 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Tue, 11 May 1999 21:51:33 +0000 Subject: [PATCH] scroll action proc's need keyword pascal for Carbon. conditionally added it. Ugly, but it works. git-svn-id: svn://10.0.0.236/trunk@31152 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/src/mac/nsScrollbar.cpp | 6 ++++++ mozilla/widget/src/mac/nsScrollbar.h | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mozilla/widget/src/mac/nsScrollbar.cpp b/mozilla/widget/src/mac/nsScrollbar.cpp index 5dda67595b7..01895675269 100644 --- a/mozilla/widget/src/mac/nsScrollbar.cpp +++ b/mozilla/widget/src/mac/nsScrollbar.cpp @@ -18,6 +18,9 @@ #include "nsScrollbar.h" #include "nsIDeviceContext.h" +#if TARGET_CARBON +#include +#endif NS_IMPL_ADDREF(nsScrollbar); NS_IMPL_RELEASE(nsScrollbar); @@ -109,6 +112,9 @@ nsresult nsScrollbar::QueryInterface(const nsIID& aIID, void** aInstancePtr) * @param ctrl - The Control being tracked * @param part - Part of the control (arrow, thumb, gutter) being hit */ +#if TARGET_CARBON +pascal +#endif void nsScrollbar::ScrollActionProc(ControlHandle ctrl, ControlPartCode part) { nsScrollbar* me = (nsScrollbar*)(::GetControlReference(ctrl)); diff --git a/mozilla/widget/src/mac/nsScrollbar.h b/mozilla/widget/src/mac/nsScrollbar.h index 5cd5d8120db..b76de8cf7e3 100644 --- a/mozilla/widget/src/mac/nsScrollbar.h +++ b/mozilla/widget/src/mac/nsScrollbar.h @@ -83,7 +83,11 @@ protected: private: - static void ScrollActionProc(ControlHandle, ControlPartCode); + static + #if TARGET_CARBON + pascal + #endif + void ScrollActionProc(ControlHandle, ControlPartCode); void DoScrollAction(ControlPartCode); // DATA