зеркало из https://github.com/mozilla/gecko-dev.git
b=118889 r=rods sr=sfraser Fixed app. so printSettings dialogs will work
This commit is contained in:
Родитель
2e7ccabc8a
Коммит
7566ecdbdc
|
@ -86,8 +86,11 @@ nsPrintOptionsX::~nsPrintOptionsX()
|
||||||
/** ---------------------------------------------------
|
/** ---------------------------------------------------
|
||||||
*/
|
*/
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsPrintOptionsX::ShowNativeDialog(void)
|
nsPrintOptionsX::ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
ReadPrefs();
|
||||||
|
|
||||||
NS_ASSERTION(mPageFormat != kPMNoPageFormat, "No page format");
|
NS_ASSERTION(mPageFormat != kPMNoPageFormat, "No page format");
|
||||||
if (mPageFormat == kPMNoPageFormat)
|
if (mPageFormat == kPMNoPageFormat)
|
||||||
return NS_ERROR_NOT_INITIALIZED;
|
return NS_ERROR_NOT_INITIALIZED;
|
||||||
|
@ -104,6 +107,8 @@ nsPrintOptionsX::ShowNativeDialog(void)
|
||||||
status = ::PMPageSetupDialog(mPageFormat, &accepted);
|
status = ::PMPageSetupDialog(mPageFormat, &accepted);
|
||||||
|
|
||||||
::PMEnd();
|
::PMEnd();
|
||||||
|
|
||||||
|
WritePrefs();
|
||||||
|
|
||||||
if (status != noErr)
|
if (status != noErr)
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
|
|
|
@ -55,7 +55,7 @@ public:
|
||||||
nsPrintOptionsX();
|
nsPrintOptionsX();
|
||||||
virtual ~nsPrintOptionsX();
|
virtual ~nsPrintOptionsX();
|
||||||
|
|
||||||
NS_IMETHOD ShowNativeDialog(void);
|
NS_IMETHOD ShowPrintSetupDialog(nsIPrintSettings *aThePrintSettings);
|
||||||
|
|
||||||
NS_IMETHOD ReadPrefs(void);
|
NS_IMETHOD ReadPrefs(void);
|
||||||
NS_IMETHOD WritePrefs(void);
|
NS_IMETHOD WritePrefs(void);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче