Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 04:45:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean out some old stuff pertaining to classic Mac OS (bug 231337) r=sdagley sr=bzbarsky

Browse Source
This commit is contained in:
joshmoz%gmail.com 2004-10-24 17:36:11 +00:00
parent 8cf7d0e9af
commit 5d66148191
4 changed files with 7 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/src/mac/nsNativeThemeMac.cpp
View File

@ -491,11 +491,8 @@ nsNativeThemeMac::GetWidgetBorder(nsIDeviceContext* aContext,
switch ( aWidgetType ) {
case NS_THEME_BUTTON:
if ( nsRenderingContextMac::OnMacOSX() )
aResult->SizeTo(kAquaPushButtonEndcaps, kAquaPushButtonTopBottom,
kAquaPushButtonEndcaps, kAquaPushButtonTopBottom);
else
aResult->SizeTo(5,2,5,2); // 5px for AGA
aResult->SizeTo(kAquaPushButtonEndcaps, kAquaPushButtonTopBottom,
kAquaPushButtonEndcaps, kAquaPushButtonTopBottom);
break;
case NS_THEME_BUTTON_SMALL:
@ -508,11 +505,8 @@ nsNativeThemeMac::GetWidgetBorder(nsIDeviceContext* aContext,
break;
case NS_THEME_DROPDOWN:
if ( nsRenderingContextMac::OnMacOSX() )
aResult->SizeTo(kAquaDropdownLeftEndcap, kAquaPushButtonTopBottom,
kAquaDropwdonRightEndcap, kAquaPushButtonTopBottom);
else
aResult->SizeTo(3,0,3,0); // 3px for AGA
aResult->SizeTo(kAquaDropdownLeftEndcap, kAquaPushButtonTopBottom,
kAquaDropwdonRightEndcap, kAquaPushButtonTopBottom);
break;
case NS_THEME_TEXTFIELD:

19
gfx/src/mac/nsRenderingContextMac.cpp
View File

@ -1473,28 +1473,11 @@ nsRenderingContextMac::ReleaseBackbuffer(void)
NS_IMETHODIMP
nsRenderingContextMac::UseBackbuffer(PRBool* aUseBackbuffer)
{
*aUseBackbuffer = !OnMacOSX();
*aUseBackbuffer = PR_FALSE;
return NS_OK;
}
//
// Return true if we are on Mac OS X, caching the result after the first call
//
PRBool
nsRenderingContextMac::OnMacOSX()
{
static PRBool gInitVer = PR_FALSE;
static PRBool gOnMacOSX = PR_FALSE;
if(! gInitVer) {
long version;
OSErr err = ::Gestalt(gestaltSystemVersion, &version);
gOnMacOSX = (err == noErr && version >= 0x00001000);
gInitVer = PR_TRUE;
}
return gOnMacOSX;
}
PRBool
nsRenderingContextMac::OnJaguar()
{

3
gfx/src/mac/nsRenderingContextMac.h
View File

@ -177,8 +177,7 @@ public:
nsresult SetPortTextState();
nsresult Init(nsIDeviceContext* aContext, CGrafPtr aPort);
// useful for determining if we're running on MacOSX
static PRBool OnMacOSX();
// for determining if we're running on at least Mac OS X 10.2
static PRBool OnJaguar();
protected:

82
xpfe/appshell/src/nsAppShellService.cpp
View File

@ -64,11 +64,6 @@
#include "nsITimelineService.h"
#include "prprf.h"
#if defined(XP_MAC) || defined(XP_MACOSX)
#include <Gestalt.h>
static PRBool OnMacOSX();
#endif
#include "nsWidgetsCID.h"
#include "nsIRequestObserver.h"
@ -749,10 +744,7 @@ nsAppShellService::CalculateWindowZLevel(nsIXULWindow *aParent,
PRUint32 modalDepMask = nsIWebBrowserChrome::CHROME_MODAL |
nsIWebBrowserChrome::CHROME_DEPENDENT;
if (aParent && (aChromeMask & modalDepMask)) {
if (::OnMacOSX())
aParent->GetZLevel(&zLevel);
else
zLevel = nsIXULWindow::highestZ;
aParent->GetZLevel(&zLevel);
}
#else
/* Platforms with native support for dependent windows (that's everyone
@ -1015,60 +1007,9 @@ nsAppShellService::UnregisterTopLevelWindow(nsIXULWindow* aWindow)
return NS_OK;
}
/* The only thing we do with this knowledge is deactivate all other windows
on Mac OS 9. */
NS_IMETHODIMP
nsAppShellService::TopLevelWindowIsModal(nsIXULWindow *aWindow, PRBool aModal)
{
#if defined(XP_MAC) || defined(XP_MACOSX)
PRBool enable,
takeAction = PR_FALSE;
// adjust our counter and prepare to take action if we just opened
// our first modal window or closed our last.
NS_ASSERTION(aModal || !aModal && mModalWindowCount > 0, "modal window count error");
if (aModal && ++mModalWindowCount == 1) {
enable = PR_FALSE;
takeAction = PR_TRUE;
} else if (!aModal && --mModalWindowCount == 0) {
enable = PR_TRUE;
takeAction = PR_TRUE;
}
if (!takeAction)
return NS_OK;
if (::OnMacOSX()) // application modal windows only happen on the classic Mac
return NS_OK;
// prepare to visit each open window
if (!mWindowMediator)
return NS_ERROR_FAILURE;
nsCOMPtr<nsISimpleEnumerator> windowList;
mWindowMediator->GetXULWindowEnumerator(0, getter_AddRefs(windowList));
if (!windowList)
return NS_ERROR_FAILURE;
// if we just closed our last modal window, enable every window.
// if we just opened our first, disable every window but aWindow
do {
PRBool more;
windowList->HasMoreElements(&more);
if (!more)
break;
nsCOMPtr<nsISupports> supportsWindow;
windowList->GetNext(getter_AddRefs(supportsWindow));
nsCOMPtr<nsIXULWindow> listXULWindow(do_QueryInterface(supportsWindow));
if (enable || listXULWindow != aWindow) {
nsCOMPtr<nsIBaseWindow> listBaseWindow(do_QueryInterface(supportsWindow));
if (listBaseWindow)
listBaseWindow->SetEnabled(enable);
}
} while(1);
#endif
return NS_OK;
}
@ -1510,27 +1451,6 @@ nsAppShellService::GetNativeAppSupport( nsINativeAppSupport **aResult ) {
return *aResult ? NS_OK : NS_ERROR_NULL_POINTER;
}
#if defined(XP_MAC) || defined(XP_MACOSX)
//
// Return true if we are on Mac OS X, caching the result after the first call
//
static PRBool
OnMacOSX()
{
static PRBool gInitVer = PR_FALSE;
static PRBool gOnMacOSX = PR_FALSE;
if(! gInitVer) {
long version;
OSErr err = ::Gestalt(gestaltSystemVersion, &version);
gOnMacOSX = (err == noErr && version >= 0x00001000);
gInitVer = PR_TRUE;
}
return gOnMacOSX;
}
#endif
static nsresult ConvertToUnicode(nsCString& aCharset, const char* inString, nsAString& outString)
{
nsresult rv;