зеркало из https://github.com/mozilla/gecko-dev.git
ifdef-fu for mach-o. rs=hyatt
This commit is contained in:
Родитель
4f52a4c146
Коммит
52262d2123
|
@ -1841,7 +1841,7 @@ SetFont(nsIPresContext* aPresContext, nsIStyleContext* aContext,
|
|||
}
|
||||
|
||||
// NavQuirks uses sans-serif instead of whatever the native font is
|
||||
#ifdef XP_MAC
|
||||
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||
if (eCompatibility_NavQuirks == mode) {
|
||||
switch (sysID) {
|
||||
case eSystemFont_Field:
|
||||
|
@ -1908,7 +1908,7 @@ SetFont(nsIPresContext* aPresContext, nsIStyleContext* aContext,
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef XP_UNIX
|
||||
#if defined(XP_UNIX) && !defined(XP_MACOSX)
|
||||
if (eCompatibility_NavQuirks == mode) {
|
||||
switch (sysID) {
|
||||
case eSystemFont_Field:
|
||||
|
|
|
@ -132,7 +132,7 @@ nsTransform2D *theTransform;
|
|||
theTransform->SetToIdentity();
|
||||
theTransform->AddScale(app2dev, app2dev);
|
||||
|
||||
#ifdef XP_UNIX
|
||||
#if defined(XP_UNIX) && !defined(XP_MACOSX)
|
||||
srcRect.SetRect(0,0,tvrect.width,tvrect.height);
|
||||
SetClipRect(srcRect, nsClipCombine_kReplace, clip);
|
||||
#endif
|
||||
|
|
|
@ -132,7 +132,7 @@ nsTransform2D *theTransform;
|
|||
theTransform->SetToIdentity();
|
||||
theTransform->AddScale(app2dev, app2dev);
|
||||
|
||||
#ifdef XP_UNIX
|
||||
#if defined(XP_UNIX) && !defined(XP_MACOSX)
|
||||
srcRect.SetRect(0,0,tvrect.width,tvrect.height);
|
||||
SetClipRect(srcRect, nsClipCombine_kReplace, clip);
|
||||
#endif
|
||||
|
|
|
@ -766,7 +766,7 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve
|
|||
// Test if special 'table selection' key is pressed
|
||||
PRBool doTableSelection;
|
||||
|
||||
#ifdef XP_MAC
|
||||
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||
doTableSelection = aMouseEvent->isMeta;
|
||||
#else
|
||||
doTableSelection = aMouseEvent->isControl;
|
||||
|
@ -1079,7 +1079,7 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
|
|||
|
||||
nsMouseEvent *me = (nsMouseEvent *)aEvent;
|
||||
|
||||
#ifdef XP_MAC
|
||||
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||
if (me->isControl)
|
||||
return NS_OK;//short ciruit. hard coded for mac due to time restraints.
|
||||
#endif
|
||||
|
|
|
@ -766,7 +766,7 @@ nsFrame::GetDataForTableSelection(nsIFrameSelection *aFrameSelection, nsMouseEve
|
|||
// Test if special 'table selection' key is pressed
|
||||
PRBool doTableSelection;
|
||||
|
||||
#ifdef XP_MAC
|
||||
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||
doTableSelection = aMouseEvent->isMeta;
|
||||
#else
|
||||
doTableSelection = aMouseEvent->isControl;
|
||||
|
@ -1079,7 +1079,7 @@ nsFrame::HandlePress(nsIPresContext* aPresContext,
|
|||
|
||||
nsMouseEvent *me = (nsMouseEvent *)aEvent;
|
||||
|
||||
#ifdef XP_MAC
|
||||
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||
if (me->isControl)
|
||||
return NS_OK;//short ciruit. hard coded for mac due to time restraints.
|
||||
#endif
|
||||
|
|
|
@ -1841,7 +1841,7 @@ SetFont(nsIPresContext* aPresContext, nsIStyleContext* aContext,
|
|||
}
|
||||
|
||||
// NavQuirks uses sans-serif instead of whatever the native font is
|
||||
#ifdef XP_MAC
|
||||
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||
if (eCompatibility_NavQuirks == mode) {
|
||||
switch (sysID) {
|
||||
case eSystemFont_Field:
|
||||
|
@ -1908,7 +1908,7 @@ SetFont(nsIPresContext* aPresContext, nsIStyleContext* aContext,
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef XP_UNIX
|
||||
#if defined(XP_UNIX) && !defined(XP_MACOSX)
|
||||
if (eCompatibility_NavQuirks == mode) {
|
||||
switch (sysID) {
|
||||
case eSystemFont_Field:
|
||||
|
|
Загрузка…
Ссылка в новой задаче