[ 1585253 ] Various important bugfixes to wxFileName::Normalize

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

diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h
index dba9a454129d61e0b9fb32c50677d47c45637436..1e81317e25e313e5ba4dac1fb9278d08a915a058 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_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "printdlg.h"
-#endif
-
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dialog.h"
@@ -38,17 +34,20 @@ public:
     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; }
-    
+   
 private:
     void* m_devMode;
     void* m_devNames;
 
+    short m_customWindowsPaperId;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData)
 };