add directshow define

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

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index b8bebcc695227a13166109759577f40e1d41df9e..1396ddc026bdd04addb499c10fe91f9767ed9e47 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -35,19 +35,19 @@ public:
     wxWindowsPrintNativeData();
     virtual ~wxWindowsPrintNativeData();
     
     wxWindowsPrintNativeData();
     virtual ~wxWindowsPrintNativeData();
     

-    virtual bool ConvertTo( wxPrintData &data );
-    virtual bool ConvertFrom( const wxPrintData &data );
+    virtual bool TransferTo( wxPrintData &data );
+    virtual bool TransferFrom( const wxPrintData &data );

     
     virtual bool Ok() const;
     
     
     virtual bool Ok() const;
     

-    void* GetNativeData() const { return m_devMode; }
-    void SetNativeData(void* data) { m_devMode = data; }
-    void* GetNativeDataDevNames() const { return m_devNames; }
-    void SetNativeDataDevNames(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:
     
 private:

-    void*           m_devMode;
-    void*           m_devNames;
+    void* m_devMode;
+    void* m_devNames;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)


@@ -71,10 +71,18 @@ public:
     wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
     virtual wxDC *GetPrintDC();
 
     wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
     virtual wxDC *GetPrintDC();
 

+private:

     wxPrintDialogData m_printDialogData;
     wxDC*             m_printerDC;
     bool              m_destroyDC;
     wxWindow*         m_dialogParent;
     wxPrintDialogData m_printDialogData;
     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)
 
 private:
     DECLARE_NO_COPY_CLASS(wxWindowsPrintDialog)


@@ -92,12 +100,15 @@ 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)
 };
 
     DECLARE_NO_COPY_CLASS(wxPageSetupDialog)
 };