re-enable drawing our own resize grip with GTK3, themes can (and do) disable the...

[wxWidgets.git] / src / osx / printdlg_osx.cpp

diff --git a/src/osx/printdlg_osx.cpp b/src/osx/printdlg_osx.cpp
index c0edeccc5642027924c702dff1491fb760ff3898..470a6567fcaed299ba40e2fc85cedde7ff110fd3 100644 (file)
--- a/src/osx/printdlg_osx.cpp
+++ b/src/osx/printdlg_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: printdlg.cpp 58164 2009-01-17 08:46:00Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -67,10 +67,9 @@ bool wxMacPrintDialog::Create( wxWindow *p, wxPrintDialogData *data )
 
 wxMacPrintDialog::~wxMacPrintDialog()
 {
 
 wxMacPrintDialog::~wxMacPrintDialog()
 {

-    if (m_destroyDC && m_printerDC)
+    if (m_destroyDC)

     {
     {

-        delete m_printerDC;
-        m_printerDC = NULL;
+        wxDELETE(m_printerDC);

     }
 }
 
     }
 }
 


@@ -81,13 +80,13 @@ wxDC *wxMacPrintDialog::GetPrintDC()
 
 IMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase)
 
 
 IMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase)
 

-wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupData *data )
+wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupDialogData *data )

     : wxPageSetupDialogBase()
 {
     Create( p, data );
 }
 
     : wxPageSetupDialogBase()
 {
     Create( p, data );
 }
 

-bool wxMacPageSetupDialog::Create( wxWindow *p, wxPageSetupData *data )
+bool wxMacPageSetupDialog::Create( wxWindow *p, wxPageSetupDialogData *data )

 {
     m_dialogParent = p;
 
 {
     m_dialogParent = p;
 


@@ -101,14 +100,14 @@ wxMacPageSetupDialog::~wxMacPageSetupDialog()
 {
 }
 
 {
 }
 

-wxPageSetupData& wxMacPageSetupDialog::GetPageSetupDialogData()
+wxPageSetupDialogData& wxMacPageSetupDialog::GetPageSetupDialogData()

 {
     return m_pageSetupData;
 }
 
 IMPLEMENT_CLASS(wxMacPageMarginsDialog, wxDialog)
 
 {
     return m_pageSetupData;
 }
 
 IMPLEMENT_CLASS(wxMacPageMarginsDialog, wxDialog)
 

-wxMacPageMarginsDialog::wxMacPageMarginsDialog(wxFrame *parent, wxPageSetupData *data) :
+wxMacPageMarginsDialog::wxMacPageMarginsDialog(wxFrame *parent, wxPageSetupDialogData *data) :

   wxDialog(parent, wxID_ANY, wxString(wxT("Page Margins"))),
   m_pageSetupDialogData(data)
   {
   wxDialog(parent, wxID_ANY, wxString(wxT("Page Margins"))),
   m_pageSetupDialogData(data)
   {