Disable wxUSE_STD_CONTAINERS by default for MSVC6.

[wxWidgets.git] / include / wx / palmos / dcprint.h

diff --git a/include/wx/palmos/dcprint.h b/include/wx/palmos/dcprint.h
index 707c46dd4ba93f699bf95ec3216bbc1f3877030d..9ca354363034ef32479624a90ef86dd6b26e2982 100644 (file)
--- a/include/wx/palmos/dcprint.h
+++ b/include/wx/palmos/dcprint.h
@@ -12,20 +12,16 @@
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 
 #ifndef _WX_DCPRINT_H_
 #define _WX_DCPRINT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "dcprint.h"
-#endif
-

 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 

-class WXDLLEXPORT wxPrinterDC : public wxDC
+class WXDLLIMPEXP_CORE wxPrinterDC : public wxDC

 {
 public:
     // Create a printer DC (obsolete function: use wxPrintData version now)
 {
 public:
     // Create a printer DC (obsolete function: use wxPrintData version now)

-    wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT);
+    wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, wxPrintOrientation orientation = wxPORTRAIT);

 
     // Create from print data
     wxPrinterDC(const wxPrintData& data);
 
     // Create from print data
     wxPrinterDC(const wxPrintData& data);


@@ -38,13 +34,16 @@ public:
     virtual void StartPage();
     virtual void EndPage();
 
     virtual void StartPage();
     virtual void EndPage();
 

+    wxRect GetPaperRect() const;
+

 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
                               bool useMask = FALSE);
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
                               bool useMask = FALSE);
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                        int rop = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+                        wxRasterOperationMode rop = wxCOPY, bool useMask = FALSE,
+                        wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);

 
     // init the dc
     void Init();
 
     // init the dc
     void Init();


@@ -56,10 +55,10 @@ private:
 };
 
 // Gets an HDC for the default printer configuration
 };
 
 // Gets an HDC for the default printer configuration

-// WXHDC WXDLLEXPORT wxGetPrinterDC(int orientation);
+// WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(int orientation);

 
 // Gets an HDC for the specified printer configuration
 
 // Gets an HDC for the specified printer configuration

-WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& data);
+WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& data);

 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 
 #endif // wxUSE_PRINTING_ARCHITECTURE