зеркало из https://github.com/mozilla/pjs.git
knock out some unused code in widget/mac. no bug. sr=smfr
This commit is contained in:
Родитель
a5c3f31844
Коммит
5eff2f8120
|
@ -56,17 +56,11 @@
|
|||
#include <Fonts.h>
|
||||
#include <TextEdit.h>
|
||||
#include <Dialogs.h>
|
||||
#ifndef XP_MACOSX
|
||||
#include <Traps.h>
|
||||
#endif
|
||||
#include <Events.h>
|
||||
#include <Menus.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifndef XP_MACOSX
|
||||
#include "macstdlibextras.h"
|
||||
#endif
|
||||
PRBool nsAppShell::mInitializedToolbox = PR_FALSE;
|
||||
|
||||
|
||||
|
|
|
@ -63,16 +63,11 @@
|
|||
#include <Balloons.h>
|
||||
#include <Resources.h>
|
||||
#include <Appearance.h>
|
||||
#include <Gestalt.h>
|
||||
|
||||
#include "nsMacResources.h"
|
||||
|
||||
#include "nsGUIEvent.h"
|
||||
|
||||
#if !XP_MACOSX
|
||||
#include "MenuSharing.h"
|
||||
#endif
|
||||
|
||||
// CIDs
|
||||
#include "nsWidgetsCID.h"
|
||||
static NS_DEFINE_CID(kMenuCID, NS_MENU_CID);
|
||||
|
@ -344,20 +339,6 @@ nsMenuBarX :: CommandEventHandler ( EventHandlerCallRef inHandlerChain, EventRef
|
|||
break;
|
||||
}
|
||||
|
||||
#if !XP_MACOSX
|
||||
case 'SHMN':
|
||||
{ // Shared menu support
|
||||
MenuItemIndex index = command.menu.menuItemIndex;
|
||||
if (index)
|
||||
{
|
||||
(void)SharedMenuHit(GetMenuID(command.menu.menuRef), command.menu.menuItemIndex);
|
||||
::HiliteMenu(0);
|
||||
handled = noErr;
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
|
||||
default:
|
||||
{
|
||||
// given the commandID, look it up in our hashtable and dispatch to
|
||||
|
@ -450,13 +431,10 @@ nsMenuBarX::MenuConstruct( const nsMenuEvent & aMenuEvent, nsIWidget* aParentWin
|
|||
|
||||
Create(aParentWindow);
|
||||
|
||||
// if we're on X (using aqua UI guidelines for menus), remove quit and prefs
|
||||
// from our menubar.
|
||||
SInt32 result = 0L;
|
||||
OSStatus err = ::Gestalt ( gestaltMenuMgrAttr, &result );
|
||||
if ( !err && (result & gestaltMenuMgrAquaLayoutMask) )
|
||||
// since we're on OSX, remove quit and prefs from our menubar.
|
||||
AquifyMenuBar();
|
||||
err = InstallCommandEventHandler();
|
||||
|
||||
OSStatus err = InstallCommandEventHandler();
|
||||
if ( err )
|
||||
return nsEventStatus_eIgnore;
|
||||
|
||||
|
|
|
@ -99,11 +99,6 @@ DoNothing(const Rect *bounds, UInt32 eraseData, SInt16 depth, Boolean isColorDev
|
|||
}
|
||||
|
||||
|
||||
#ifdef XP_MAC
|
||||
#pragma mark -
|
||||
#endif
|
||||
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsNativeThemeMac, nsITheme)
|
||||
|
||||
nsNativeThemeMac::nsNativeThemeMac()
|
||||
|
@ -128,10 +123,6 @@ nsNativeThemeMac::~nsNativeThemeMac()
|
|||
::DisposeThemeEraseUPP(mEraseProc);
|
||||
}
|
||||
|
||||
#ifdef XP_MAC
|
||||
#pragma mark -
|
||||
#endif
|
||||
|
||||
|
||||
void
|
||||
nsNativeThemeMac::DrawCheckboxRadio ( ThemeButtonKind inKind, const Rect& inBoxRect, PRBool inChecked,
|
||||
|
@ -525,11 +516,6 @@ nsNativeThemeMac::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame*
|
|||
}
|
||||
|
||||
|
||||
#ifdef XP_MAC
|
||||
#pragma mark -
|
||||
#endif
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsNativeThemeMac::GetWidgetBorder(nsIDeviceContext* aContext,
|
||||
nsIFrame* aFrame,
|
||||
|
|
Загрузка…
Ссылка в новой задаче