adding standard menu items for cocoa, adding translation macro to menulabels, fixes...

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

diff --git a/include/wx/palmos/dcprint.h b/include/wx/palmos/dcprint.h
index 20758ead92f4f68a72d7dd3372713d9d1c2680fd..9ca354363034ef32479624a90ef86dd6b26e2982 100644 (file)
--- a/include/wx/palmos/dcprint.h
+++ b/include/wx/palmos/dcprint.h
@@ -17,11 +17,11 @@
 #include "wx/dc.h"
 #include "wx/cmndata.h"
 
 #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);


@@ -34,7 +34,7 @@ public:
     virtual void StartPage();
     virtual void EndPage();
 
     virtual void StartPage();
     virtual void EndPage();
 

-    wxRect GetPaperRect();
+    wxRect GetPaperRect() const;

 
 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
 
 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,


@@ -42,7 +42,8 @@ protected:
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
     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();


@@ -54,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