Avoid CRT deprecation warnings for MSVC build using makefiles too.

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

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 9bfcec6f305d16683f466633c2fbe406b0a3d381..bcca2b91e9eed11b2ccef4ed6e7ec826671cbcad 100644 (file)
--- 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:
 // Purpose:     wxPrintDialog, wxPageSetupDialog classes
 // Author:      Julian Smart
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_PRINTDLG_H_
 #define _WX_PRINTDLG_H_
 
 #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"
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dialog.h"


@@ -23,28 +19,31 @@
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 

-class WXDLLEXPORT wxDC;
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WinPrinter;

 
 //----------------------------------------------------------------------------
 // wxWindowsPrintNativeData
 //----------------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------------
 // wxWindowsPrintNativeData
 //----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindowsPrintNativeData: public wxPrintNativeDataBase
+class WXDLLIMPEXP_CORE wxWindowsPrintNativeData: public wxPrintNativeDataBase

 {
 public:
     wxWindowsPrintNativeData();
     virtual ~wxWindowsPrintNativeData();
 {
 public:
     wxWindowsPrintNativeData();
     virtual ~wxWindowsPrintNativeData();

-    
+

     virtual bool TransferTo( wxPrintData &data );
     virtual bool TransferFrom( const wxPrintData &data );
     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; }
     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;
 private:
     void* m_devMode;
     void* m_devNames;


@@ -54,12 +53,12 @@ private:
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };

-    
+

 // ---------------------------------------------------------------------------
 // wxWindowsPrintDialog: the MSW dialog for printing
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // wxWindowsPrintDialog: the MSW dialog for printing
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindowsPrintDialog : public wxPrintDialogBase
+class WXDLLIMPEXP_CORE wxWindowsPrintDialog : public wxPrintDialogBase

 {
 public:
     wxWindowsPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
 {
 public:
     wxWindowsPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);


@@ -71,31 +70,32 @@ public:
 
     wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
     wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
 
     wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
     wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }

+

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

-    wxDC*             m_printerDC;
+    wxPrinterDC*      m_printerDC;

     bool              m_destroyDC;
     wxWindow*         m_dialogParent;
     bool              m_destroyDC;
     wxWindow*         m_dialogParent;

-    
+

 private:
     bool ConvertToNative( wxPrintDialogData &data );
     bool ConvertFromNative( wxPrintDialogData &data );
 private:
     bool ConvertToNative( wxPrintDialogData &data );
     bool ConvertFromNative( wxPrintDialogData &data );

-    
+

     // holds MSW handle
     void*             m_printDlg;
 
 private:
     // holds MSW handle
     void*             m_printDlg;
 
 private:

-    DECLARE_NO_COPY_CLASS(wxWindowsPrintDialog)
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog);

     DECLARE_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();
 {
 public:
     wxWindowsPageSetupDialog();


@@ -112,7 +112,7 @@ public:
 private:
     wxPageSetupDialogData   m_pageSetupData;
     wxWindow*               m_dialogParent;
 private:
     wxPageSetupDialogData   m_pageSetupData;
     wxWindow*               m_dialogParent;

-    
+

     // holds MSW handle
     void*                   m_pageDlg;
 
     // holds MSW handle
     void*                   m_pageDlg;