X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa96f01c02ca602769785fa4bad0dd69ae6cad05..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/msw/printdlg.h?ds=inline

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 3f76a0b207..9f2330f071 100644
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        printdlg.h
+// Name:        wx/msw/printdlg.h
 // Purpose:     wxPrintDialog, wxPageSetupDialog classes
 // Author:      Julian Smart
 // Modified by:
@@ -12,10 +12,6 @@
 #ifndef _WX_PRINTDLG_H_
 #define _WX_PRINTDLG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "printdlg.h"
-#endif
-
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dialog.h"
@@ -23,41 +19,46 @@
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 
-class WXDLLEXPORT wxDC;
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WinPrinter;
 
 //----------------------------------------------------------------------------
 // wxWindowsPrintNativeData
 //----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowsPrintNativeData: public wxPrintNativeDataBase
+class WXDLLIMPEXP_CORE wxWindowsPrintNativeData: public wxPrintNativeDataBase
 {
 public:
     wxWindowsPrintNativeData();
     virtual ~wxWindowsPrintNativeData();
-    
+
     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
-    
-    virtual bool Ok() const;
-    
+
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const;
+
+    void InitializeDevMode(const wxString &printerName = wxEmptyString, WinPrinter* printer = NULL);
     void* GetDevMode() const { return m_devMode; }
     void SetDevMode(void* data) { m_devMode = data; }
     void* GetDevNames() const { return m_devNames; }
     void SetDevNames(void* data) { m_devNames = data; }
-   
+
 private:
     void* m_devMode;
     void* m_devNames;
 
+    short m_customWindowsPaperId;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };
-    
+
 // ---------------------------------------------------------------------------
 // wxWindowsPrintDialog: the MSW dialog for printing
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowsPrintDialog : public wxPrintDialogBase
+class WXDLLIMPEXP_CORE wxWindowsPrintDialog : public wxPrintDialogBase
 {
 public:
     wxWindowsPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
@@ -69,31 +70,32 @@ public:
 
     wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
     wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
+
     virtual wxDC *GetPrintDC();
 
 private:
     wxPrintDialogData m_printDialogData;
-    wxDC*             m_printerDC;
+    wxPrinterDC*      m_printerDC;
     bool              m_destroyDC;
     wxWindow*         m_dialogParent;
-    
+
 private:
     bool ConvertToNative( wxPrintDialogData &data );
     bool ConvertFromNative( wxPrintDialogData &data );
-    
+
     // holds MSW handle
     void*             m_printDlg;
 
 private:
-    DECLARE_NO_COPY_CLASS(wxWindowsPrintDialog)
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog);
     DECLARE_CLASS(wxWindowsPrintDialog)
 };
 
 // ---------------------------------------------------------------------------
-// wxWindowsPageSetupDialog: the MSW page setup dialog 
+// wxWindowsPageSetupDialog: the MSW page setup dialog
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxWindowsPageSetupDialog: public wxPageSetupDialogBase
+class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase
 {
 public:
     wxWindowsPageSetupDialog();
@@ -105,12 +107,12 @@ public:
     bool ConvertToNative( wxPageSetupDialogData &data );
     bool ConvertFromNative( wxPageSetupDialogData &data );
 
-    virtual wxPageSetupData& GetPageSetupDialogData() { return m_pageSetupData; }
+    virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; }
 
 private:
     wxPageSetupDialogData   m_pageSetupData;
     wxWindow*               m_dialogParent;
-    
+
     // holds MSW handle
     void*                   m_pageDlg;