Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup - reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-02-13 08:03:37 +00:00
parent e493ecef80
commit cc224d6e79
1 changed files with 75 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/mac/carbon/printdlg.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: printdlg.cpp
// Name: src/mac/carbon/printdlg.cpp
// Purpose: wxPrintDialog, wxPageSetupDialog
// Author: Stefan Csomor
// Modified by:
@@ -20,15 +20,17 @@
#include "wx/msgdlg.h"
#include "wx/mac/private/print.h"
// Use generic page setup dialog: use your own native one if one exists.
IMPLEMENT_DYNAMIC_CLASS(wxMacPrintDialog, wxPrintDialogBase)
wxMacPrintDialog::wxMacPrintDialog()
{
m_dialogParent = NULL;
m_printerDC = NULL;
m_destroyDC = TRUE;
m_destroyDC = true;
}
wxMacPrintDialog::wxMacPrintDialog( wxWindow *p, wxPrintDialogData *data )
@@ -39,7 +41,7 @@ wxMacPrintDialog::wxMacPrintDialog(wxWindow *p, wxPrintDialogData* data)
wxMacPrintDialog::wxMacPrintDialog( wxWindow *p, wxPrintData *data )
{
wxPrintDialogData data2;
if ( data )
if (data != NULL)
data2 = *data;
Create( p, &data2 );
@@ -49,17 +51,18 @@ bool wxMacPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
{
m_dialogParent = p;
m_printerDC = NULL;
m_destroyDC = TRUE;
m_destroyDC = true;
if ( data )
if (data != NULL)
m_printDialogData = *data;
return TRUE;
return true;
}
wxMacPrintDialog::~wxMacPrintDialog()
{
if (m_destroyDC && m_printerDC) {
if (m_destroyDC && m_printerDC)
{
delete m_printerDC;
m_printerDC = NULL;
}
@@ -72,17 +75,18 @@ int wxMacPrintDialog::ShowModal()
int result = wxID_CANCEL;
OSErr err = noErr;
wxString message ;
Boolean accepted;
err = PMSessionPrintDialog( ((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPrintSession,
err = PMSessionPrintDialog(
((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPrintSession,
((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPrintSettings,
((wxMacCarbonPrintData*)m_printDialogData.GetPrintData().GetNativeData())->m_macPageFormat,
&accepted );
if ((err == noErr) && !accepted)
{
err = kPMCancel; // user clicked Cancel button
// user clicked Cancel button
err = kPMCancel;
}
if (err == noErr)
@@ -92,6 +96,8 @@ int wxMacPrintDialog::ShowModal()
if ((err != noErr) && (err != kPMCancel))
{
wxString message;
message.Printf( wxT("Print Error %d"), err );
wxMessageDialog dialog( NULL, message, wxEmptyString, wxICON_HAND | wxOK );
dialog.ShowModal();
@@ -111,14 +117,10 @@ wxDC *wxMacPrintDialog::GetPrintDC()
return new wxPrinterDC( m_printDialogData.GetPrintData() );
}
/*
* wxMacPageSetupDialog
*/
IMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase)
wxMacPageSetupDialog::wxMacPageSetupDialog(wxWindow *p, wxPageSetupDialogData *data) :
wxPageSetupDialogBase()
wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupDialogData *data )
: wxPageSetupDialogBase()
{
Create( p, data );
}
@@ -127,10 +129,10 @@ bool wxMacPageSetupDialog::Create(wxWindow *p, wxPageSetupDialogData *data)
{
m_dialogParent = p;
if (data)
if (data != NULL)
m_pageSetupData = (*data);
return TRUE;
return true;
}
wxMacPageSetupDialog::~wxMacPageSetupDialog()
@@ -149,16 +151,17 @@ int wxMacPageSetupDialog::ShowModal()
int result = wxID_CANCEL;
OSErr err = noErr;
wxString message ;
Boolean accepted;
err = PMSessionPageSetupDialog( ((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->m_macPrintSession,
err = PMSessionPageSetupDialog(
((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->m_macPrintSession,
((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->m_macPageFormat,
&accepted );
if ((err == noErr) && !accepted)
{
err = kPMCancel; // user clicked Cancel button
// user clicked Cancel button
err = kPMCancel;
}
// If the user did not cancel, flatten and save the PageFormat object
@@ -167,8 +170,11 @@ int wxMacPageSetupDialog::ShowModal()
{
result = wxID_OK;
}
if ((err != noErr) && (err != kPMCancel))
{
wxString message;
message.Printf( wxT("Print Error %d"), err );
wxMessageDialog dialog( NULL, message, wxEmptyString, wxICON_HAND | wxOK );
dialog.ShowModal();
@@ -180,8 +186,8 @@ int wxMacPageSetupDialog::ShowModal()
m_pageSetupData.SetPaperSize( m_pageSetupData.GetPrintData().GetPaperSize() );
((wxMacCarbonPrintData*)m_pageSetupData.GetPrintData().GetNativeData())->TransferTo( &m_pageSetupData );
}
return result;
}
#endif