Win16 cursor/icon functions are not needed any longer

[wxWidgets.git] / include / wx / mac / printdlg.h

diff --git a/include/wx/mac/printdlg.h b/include/wx/mac/printdlg.h
index ac31a4909606ef557a500442171cd253779aff19..28d35819464f2b11f839f5d4e84e8579380de348 100644 (file)
--- a/include/wx/mac/printdlg.h
+++ b/include/wx/mac/printdlg.h
@@ -3,18 +3,18 @@
 // Purpose:     wxPrintDialog, wxPageSetupDialog classes.
 //              Use generic, PostScript version if no
 //              platform-specific implementation.
 // Purpose:     wxPrintDialog, wxPageSetupDialog classes.
 //              Use generic, PostScript version if no
 //              platform-specific implementation.

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTDLG_H_
 #define _WX_PRINTDLG_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINTDLG_H_
 #define _WX_PRINTDLG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "printdlg.h"
 #endif
 
 #pragma interface "printdlg.h"
 #endif
 


@@ -33,18 +33,21 @@ class WXDLLEXPORT wxPrintDialog: public wxDialog
 
  public:
   wxPrintDialog();
 
  public:
   wxPrintDialog();

-  wxPrintDialog(wxWindow *parent, wxPrintData* data = NULL);
+    wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
+  wxPrintDialog(wxWindow *parent, wxPrintData* data );

   ~wxPrintDialog();
 
   ~wxPrintDialog();
 

-  bool Create(wxWindow *parent, wxPrintData* data = NULL);
+    bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);

   virtual int ShowModal();
 
   virtual int ShowModal();
 

-  inline wxPrintData& GetPrintData() { return m_printData; }
+  wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
+  wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }

   virtual wxDC *GetPrintDC();
 
  private:
   virtual wxDC *GetPrintDC();
 
  private:

-  wxPrintData       m_printData;
+  wxPrintDialogData   m_printDialogData;

   wxDC*             m_printerDC;
   wxDC*             m_printerDC;

+  bool              m_destroyDC;

   wxWindow*         m_dialogParent;
 };
 
   wxWindow*         m_dialogParent;
 };
 


@@ -52,9 +55,6 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog
 {
   DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
 
 {
   DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
 

- private:
-  wxPageSetupData   m_pageSetupData;
-  wxWindow*         m_dialogParent;

  public:
   wxPageSetupDialog();
   wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
  public:
   wxPageSetupDialog();
   wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);


@@ -64,6 +64,9 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog
   virtual int ShowModal();
 
   inline wxPageSetupData& GetPageSetupData() { return m_pageSetupData; }
   virtual int ShowModal();
 
   inline wxPageSetupData& GetPageSetupData() { return m_pageSetupData; }

+ private:
+  wxPageSetupData   m_pageSetupData;
+  wxWindow*         m_dialogParent;

 };
 
 #endif
 };
 
 #endif