removing double includes

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

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index d8510258662acb1c6c098b0e7c8b46912b74f00c..06754215f34b5d88afa42d9c211fdbd3837eb888 100644 (file)
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -19,13 +19,13 @@
 #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
 //----------------------------------------------------------------------------
 

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

 {
 public:
     wxWindowsPrintNativeData();
 {
 public:
     wxWindowsPrintNativeData();


@@ -34,7 +34,8 @@ 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* GetDevMode() const { return m_devMode; }
     void SetDevMode(void* data) { m_devMode = data; }


@@ -55,7 +56,7 @@ private:
 // 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);


@@ -67,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;
     


@@ -91,7 +93,7 @@ private:
 // 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();