remove unused variable assignment, closes #14928

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

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 69921c0b4aeaf3518ff0534cb8a2967250b7882f..9f2330f071418d223527bc85e5e546b89b866dcb 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,61 +12,115 @@
 #ifndef _WX_PRINTDLG_H_
 #define _WX_PRINTDLG_H_
 
 #ifndef _WX_PRINTDLG_H_
 #define _WX_PRINTDLG_H_
 

-#ifdef __GNUG__
-#pragma interface "printdlg.h"
-#endif
+#if wxUSE_PRINTING_ARCHITECTURE

 
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
 #include "wx/dialog.h"
 #include "wx/cmndata.h"

+#include "wx/prntbase.h"
+#include "wx/printdlg.h"
+
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WinPrinter;
+
+//----------------------------------------------------------------------------
+// wxWindowsPrintNativeData
+//----------------------------------------------------------------------------
+
+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 { return IsOk(); }
+    virtual bool IsOk() const;

 
 

-class WXDLLEXPORT wxDC;
+    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)
+};

 
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------

-// wxPrinterDialog: the common dialog for printing.
+// wxWindowsPrintDialog: the MSW dialog for printing

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxPrintDialog)
-

 public:
 public:

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

 
     bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
     virtual int ShowModal();
 
     wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
     wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
 
     bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
     virtual int ShowModal();
 
     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 );
+
+    // holds MSW handle
+    void*             m_printDlg;
+
+private:
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrintDialog);
+    DECLARE_CLASS(wxWindowsPrintDialog)

 };
 
 };
 

-class WXDLLEXPORT wxPageSetupDialog: public wxDialog
-{
-    DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
+// ---------------------------------------------------------------------------
+// wxWindowsPageSetupDialog: the MSW page setup dialog
+// ---------------------------------------------------------------------------

 
 

+class WXDLLIMPEXP_CORE wxWindowsPageSetupDialog: public wxPageSetupDialogBase
+{

 public:
 public:

-    wxPageSetupDialog();
-    wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
-    virtual ~wxPageSetupDialog();
+    wxWindowsPageSetupDialog();
+    wxWindowsPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
+    virtual ~wxWindowsPageSetupDialog();

 
 

-    bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
+    bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);

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

+    bool ConvertToNative( wxPageSetupDialogData &data );
+    bool ConvertFromNative( wxPageSetupDialogData &data );

 
 

-    wxPageSetupData& GetPageSetupData() { return m_pageSetupData; }
+    virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; }

 
 private:
 
 private:

-    wxPageSetupData   m_pageSetupData;
-    wxWindow*         m_dialogParent;
+    wxPageSetupDialogData   m_pageSetupData;
+    wxWindow*               m_dialogParent;
+
+    // holds MSW handle
+    void*                   m_pageDlg;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPageSetupDialog)

 };
 
 };
 

+#endif // wxUSE_PRINTING_ARCHITECTURE
+

 #endif
     // _WX_PRINTDLG_H_
 #endif
     // _WX_PRINTDLG_H_