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
This commit is contained in:
@@ -18,6 +18,9 @@
|
||||
|
||||
#include "nsScrollbar.h"
|
||||
#include "nsIDeviceContext.h"
|
||||
#if TARGET_CARBON
|
||||
#include <ControlDefinitions.h>
|
||||
#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));
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user