check for wxUSE_TIMER in headers, not the files including them

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

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index dba9a454129d61e0b9fb32c50677d47c45637436..7a0101ec81a4404b9d08d4bf4258df8e04265f4d 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -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,7 +19,7 @@
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 

-class WXDLLEXPORT wxDC;
+class WXDLLIMPEXP_FWD_CORE wxDC;

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


@@ -38,17 +34,20 @@ public:
     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* 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;
 

+    short m_customWindowsPaperId;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };


@@ -69,11 +68,12 @@ 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;