зеркало из https://github.com/mozilla/gecko-dev.git
scroll action proc's need keyword pascal for Carbon. conditionally added it. Ugly, but it works.
This commit is contained in:
Родитель
63c8215e0f
Коммит
2393079fea
|
@ -18,6 +18,9 @@
|
||||||
|
|
||||||
#include "nsScrollbar.h"
|
#include "nsScrollbar.h"
|
||||||
#include "nsIDeviceContext.h"
|
#include "nsIDeviceContext.h"
|
||||||
|
#if TARGET_CARBON
|
||||||
|
#include <ControlDefinitions.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
NS_IMPL_ADDREF(nsScrollbar);
|
NS_IMPL_ADDREF(nsScrollbar);
|
||||||
NS_IMPL_RELEASE(nsScrollbar);
|
NS_IMPL_RELEASE(nsScrollbar);
|
||||||
|
@ -109,6 +112,9 @@ nsresult nsScrollbar::QueryInterface(const nsIID& aIID, void** aInstancePtr)
|
||||||
* @param ctrl - The Control being tracked
|
* @param ctrl - The Control being tracked
|
||||||
* @param part - Part of the control (arrow, thumb, gutter) being hit
|
* @param part - Part of the control (arrow, thumb, gutter) being hit
|
||||||
*/
|
*/
|
||||||
|
#if TARGET_CARBON
|
||||||
|
pascal
|
||||||
|
#endif
|
||||||
void nsScrollbar::ScrollActionProc(ControlHandle ctrl, ControlPartCode part)
|
void nsScrollbar::ScrollActionProc(ControlHandle ctrl, ControlPartCode part)
|
||||||
{
|
{
|
||||||
nsScrollbar* me = (nsScrollbar*)(::GetControlReference(ctrl));
|
nsScrollbar* me = (nsScrollbar*)(::GetControlReference(ctrl));
|
||||||
|
|
|
@ -83,7 +83,11 @@ protected:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
static void ScrollActionProc(ControlHandle, ControlPartCode);
|
static
|
||||||
|
#if TARGET_CARBON
|
||||||
|
pascal
|
||||||
|
#endif
|
||||||
|
void ScrollActionProc(ControlHandle, ControlPartCode);
|
||||||
void DoScrollAction(ControlPartCode);
|
void DoScrollAction(ControlPartCode);
|
||||||
|
|
||||||
// DATA
|
// DATA
|
||||||
|
|
Загрузка…
Ссылка в новой задаче