turn off directshow by default for lib dependancy

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

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index 69921c0b4aeaf3518ff0534cb8a2967250b7882f..1396ddc026bdd04addb499c10fe91f9767ed9e47 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -12,28 +12,57 @@
 #ifndef _WX_PRINTDLG_H_
 #define _WX_PRINTDLG_H_
 
 #ifndef _WX_PRINTDLG_H_
 #define _WX_PRINTDLG_H_
 

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

 #pragma interface "printdlg.h"
 #endif
 
 #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 WXDLLEXPORT wxDC;
 
 
 class WXDLLEXPORT wxDC;
 

+//----------------------------------------------------------------------------
+// wxWindowsPrintNativeData
+//----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxWindowsPrintNativeData: public wxPrintNativeDataBase
+{
+public:
+    wxWindowsPrintNativeData();
+    virtual ~wxWindowsPrintNativeData();
+    
+    virtual bool TransferTo( wxPrintData &data );
+    virtual bool TransferFrom( const wxPrintData &data );
+    
+    virtual bool Ok() const;
+    
+    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:
+    DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
+};
+    

 // ---------------------------------------------------------------------------
 // wxPrinterDialog: the common dialog for printing.
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // wxPrinterDialog: the common dialog for printing.
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPrintDialog : public wxDialog
+class WXDLLEXPORT 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();
 
     bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
     virtual int ShowModal();


@@ -47,6 +76,17 @@ private:
     wxDC*             m_printerDC;
     bool              m_destroyDC;
     wxWindow*         m_dialogParent;
     wxDC*             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)
+    DECLARE_CLASS(wxWindowsPrintDialog)

 };
 
 class WXDLLEXPORT wxPageSetupDialog: public wxDialog
 };
 
 class WXDLLEXPORT wxPageSetupDialog: public wxDialog


@@ -60,13 +100,20 @@ public:
 
     bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
     virtual int ShowModal();
 
     bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
     virtual int ShowModal();

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

 
     wxPageSetupData& GetPageSetupData() { return m_pageSetupData; }
 
 private:
     wxPageSetupData   m_pageSetupData;
     wxWindow*         m_dialogParent;
 
     wxPageSetupData& GetPageSetupData() { return m_pageSetupData; }
 
 private:
     wxPageSetupData   m_pageSetupData;
     wxWindow*         m_dialogParent;

+    void*             m_pageDlg;
+
+    DECLARE_NO_COPY_CLASS(wxPageSetupDialog)

 };
 
 };
 

+#endif // wxUSE_PRINTING_ARCHITECTURE
+

 #endif
     // _WX_PRINTDLG_H_
 #endif
     // _WX_PRINTDLG_H_