зеркало из https://github.com/mozilla/gecko-dev.git
Change to convert Widget and Gfx into component DLLs on Mac, bug 94434. r=pchen, sr=beard/darin
This commit is contained in:
Родитель
75381ccd6e
Коммит
074ac3b52d
|
@ -69,7 +69,6 @@
|
||||||
|
|
||||||
|
|
||||||
PRUint32 nsDeviceContextMac::mPixelsPerInch = 96;
|
PRUint32 nsDeviceContextMac::mPixelsPerInch = 96;
|
||||||
PRBool nsDeviceContextMac::mDisplayVerySmallFonts = true;
|
|
||||||
PRUint32 nsDeviceContextMac::sNumberOfScreens = 0;
|
PRUint32 nsDeviceContextMac::sNumberOfScreens = 0;
|
||||||
|
|
||||||
|
|
||||||
|
@ -969,25 +968,6 @@ PRUint32 nsDeviceContextMac::GetScreenResolution()
|
||||||
return mPixelsPerInch;
|
return mPixelsPerInch;
|
||||||
}
|
}
|
||||||
|
|
||||||
PRBool nsDeviceContextMac::DisplayVerySmallFonts()
|
|
||||||
{
|
|
||||||
static PRBool initialized = PR_FALSE;
|
|
||||||
if (initialized)
|
|
||||||
return mDisplayVerySmallFonts;
|
|
||||||
initialized = PR_TRUE;
|
|
||||||
|
|
||||||
nsresult rv;
|
|
||||||
nsCOMPtr<nsIPref> prefs(do_GetService(kPrefCID, &rv));
|
|
||||||
if (NS_SUCCEEDED(rv) && prefs) {
|
|
||||||
PRBool boolVal;
|
|
||||||
if (NS_SUCCEEDED(prefs->GetBoolPref("browser.display_very_small_fonts", &boolVal))) {
|
|
||||||
mDisplayVerySmallFonts = boolVal;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return mDisplayVerySmallFonts;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#pragma mark -
|
#pragma mark -
|
||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
|
|
|
@ -111,11 +111,9 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static PRUint32 mPixelsPerInch;
|
static PRUint32 mPixelsPerInch;
|
||||||
static PRBool mDisplayVerySmallFonts;
|
|
||||||
static PRUint32 sNumberOfScreens; // how many screens we have.
|
static PRUint32 sNumberOfScreens; // how many screens we have.
|
||||||
public:
|
public:
|
||||||
static PRUint32 GetScreenResolution();
|
static PRUint32 GetScreenResolution();
|
||||||
static PRBool DisplayVerySmallFonts();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -116,6 +116,8 @@ NS_IMETHODIMP nsDeviceContextSpecX::Init(PRBool aQuiet)
|
||||||
|
|
||||||
if (! aQuiet)
|
if (! aQuiet)
|
||||||
{
|
{
|
||||||
|
::InitCursor();
|
||||||
|
|
||||||
Boolean accepted = false;
|
Boolean accepted = false;
|
||||||
status = ::PMPrintDialog(mPrintSettings, mPageFormat, &accepted);
|
status = ::PMPrintDialog(mPrintSettings, mPageFormat, &accepted);
|
||||||
if (! accepted)
|
if (! accepted)
|
||||||
|
|
|
@ -98,6 +98,8 @@ nsPrintOptionsX::ShowNativeDialog(void)
|
||||||
Boolean validated;
|
Boolean validated;
|
||||||
::PMValidatePageFormat(mPageFormat, &validated);
|
::PMValidatePageFormat(mPageFormat, &validated);
|
||||||
|
|
||||||
|
::InitCursor();
|
||||||
|
|
||||||
Boolean accepted = false;
|
Boolean accepted = false;
|
||||||
status = ::PMPageSetupDialog(mPageFormat, &accepted);
|
status = ::PMPageSetupDialog(mPageFormat, &accepted);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче