Borland makefile fixes

[wxWidgets.git] / src / msw / data.cpp

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index 32bc09daff41ce7e9247a4a87abb3877ae4c4863..e7e0283111655d21a2c116aea01d210f81e52a60 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -24,6 +24,8 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

+#include "wx/prntbase.h"
+

 #define _MAXPATHLEN 500
 
 // Useful buffer, initialized in wxCommonInit
 #define _MAXPATHLEN 500
 
 // Useful buffer, initialized in wxCommonInit


@@ -154,11 +156,6 @@ const char *wxDoubleToStringStr = "%.2f";
 const char *wxUserResourceStr = "TEXT";
 #endif
 
 const char *wxUserResourceStr = "TEXT";
 #endif
 

-#if wxUSE_POSTSCRIPT
-class wxPrintPaperDatabase;
-wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL;
-#endif
-

 #if wxUSE_SHARED_LIBRARY
 /*
  * For wxWindows to be made into a dynamic library (e.g. Sun),
 #if wxUSE_SHARED_LIBRARY
 /*
  * For wxWindows to be made into a dynamic library (e.g. Sun),


@@ -319,9 +316,10 @@ IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
 IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPageSetupData, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPageSetupData, wxObject)

+#endif
+

 IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)

-#endif

 
 #if wxUSE_WX_RESOURCES
 #include "wx/resource.h"
 
 #if wxUSE_WX_RESOURCES
 #include "wx/resource.h"