X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/147bf2639f28010ad095298941e9eb206328d2c1..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/gtk/gnome/gprint.h diff --git a/include/wx/gtk/gnome/gprint.h b/include/wx/gtk/gnome/gprint.h index 2148bfbe5f..d2d1ee6948 100644 --- a/include/wx/gtk/gnome/gprint.h +++ b/include/wx/gtk/gnome/gprint.h @@ -8,10 +8,8 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __gprint_H__ -#define __gprint_H__ - -// Include wxWindows' headers +#ifndef _WX_GTK_GPRINT_H_ +#define _WX_GTK_GPRINT_H_ #include "wx/defs.h" @@ -50,7 +48,6 @@ private: GnomePrintConfig *m_config; GnomePrintJob *m_job; -private: DECLARE_DYNAMIC_CLASS(wxGnomePrintNativeData) }; @@ -116,7 +113,7 @@ public: virtual bool TransferDataToWindow(); virtual bool TransferDataFromWindow(); -private: +protected: // Implement some base class methods to do nothing to avoid asserts and // GTK warnings, since this is not a real wxDialog. virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), @@ -125,10 +122,10 @@ private: virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height)) {} +private: void Init(); wxPrintDialogData m_printDialogData; -private: DECLARE_DYNAMIC_CLASS(wxGnomePrintDialog) }; @@ -151,7 +148,7 @@ public: virtual bool TransferDataToWindow(); virtual bool TransferDataFromWindow(); -private: +protected: // Implement some base class methods to do nothing to avoid asserts and // GTK warnings, since this is not a real wxDialog. virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), @@ -160,9 +157,9 @@ private: virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height)) {} +private: wxPageSetupDialogData m_pageDialogData; -private: DECLARE_DYNAMIC_CLASS(wxGnomePageSetupDialog) }; @@ -182,10 +179,7 @@ public: virtual wxDC* PrintDialog(wxWindow *parent); virtual bool Setup(wxWindow *parent); - GnomePrintContext *GetPrintContext() { return m_gpc; } - private: - GnomePrintContext *m_gpc; bool m_native_preview; private: @@ -200,13 +194,38 @@ private: class wxGnomePrintDC: public wxDC { public: - wxGnomePrintDC( wxGnomePrinter *printer ); wxGnomePrintDC( const wxPrintData& data ); virtual ~wxGnomePrintDC(); bool Ok() const { return IsOk(); } bool IsOk() const; + bool CanDrawBitmap() const { return true; } + void Clear(); + void SetFont( const wxFont& font ); + void SetPen( const wxPen& pen ); + void SetBrush( const wxBrush& brush ); + void SetLogicalFunction( int function ); + void SetBackground( const wxBrush& brush ); + void DestroyClippingRegion(); + bool StartDoc(const wxString& message); + void EndDoc(); + void StartPage(); + void EndPage(); + wxCoord GetCharHeight() const; + wxCoord GetCharWidth() const; + bool CanGetTextExtent() const { return true; } + wxSize GetPPI() const; + void SetAxisOrientation( bool xLeftRight, bool yBottomUp ); + void SetLogicalOrigin( wxCoord x, wxCoord y ); + void SetDeviceOrigin( wxCoord x, wxCoord y ); + virtual int GetDepth() const { return 24; } + void SetBackgroundMode(int WXUNUSED(mode)) { } + void SetPalette(const wxPalette& WXUNUSED(palette)) { } + static void SetResolution(int ppi); + static int GetResolution(); + +protected: bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE ); bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const; void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); @@ -223,56 +242,24 @@ public: #if wxUSE_SPLINES void DoDrawSpline(wxList *points); #endif // wxUSE_SPLINES - bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ); void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false ); - bool CanDrawBitmap() const { return true; } - void DoDrawText(const wxString& text, wxCoord x, wxCoord y ); void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle); - void Clear(); - void SetFont( const wxFont& font ); - void SetPen( const wxPen& pen ); - void SetBrush( const wxBrush& brush ); - void SetLogicalFunction( int function ); - void SetBackground( const wxBrush& brush ); - void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - void DestroyClippingRegion(); void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) { } - - bool StartDoc(const wxString& message); - void EndDoc(); - void StartPage(); - void EndPage(); - - wxCoord GetCharHeight() const; - wxCoord GetCharWidth() const; - bool CanGetTextExtent() const { return true; } void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent = (wxCoord *) NULL, wxCoord *externalLeading = (wxCoord *) NULL, - wxFont *theFont = (wxFont *) NULL ) const; - + const wxFont *theFont = (wxFont *) NULL ) const; void DoGetSize(int* width, int* height) const; void DoGetSizeMM(int *width, int *height) const; - wxSize GetPPI() const; - void SetAxisOrientation( bool xLeftRight, bool yBottomUp ); - void SetDeviceOrigin( wxCoord x, wxCoord y ); - - virtual int GetDepth() const { return 24; } - - void SetBackgroundMode(int WXUNUSED(mode)) { } - void SetPalette(const wxPalette& WXUNUSED(palette)) { } + void SetPrintData(const wxPrintData& data); wxPrintData& GetPrintData() { return m_printData; } - void SetPrintData(const wxPrintData& data) { m_printData = data; } - - static void SetResolution(int ppi); - static int GetResolution(); private: static float ms_PSScaleFactor; @@ -286,74 +273,46 @@ private: unsigned char m_currentRed; unsigned char m_currentGreen; unsigned char m_currentBlue; - wxPrintData m_printData; - wxGnomePrinter *m_printer; + int m_deviceOffsetY; + GnomePrintContext *m_gpc; - GnomePrintJob* m_job; // only used and destroyed when created with wxPrintData + GnomePrintJob* m_job; void makeEllipticalPath(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - + private: wxCoord XDEV2LOG(wxCoord x) const { - wxCoord new_x = x - m_deviceOriginX; - if (new_x > 0) - return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX; - else - return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX; + return wxRound((double)(x - m_deviceOriginX) / m_scaleX) * m_signX + m_logicalOriginX; } wxCoord XDEV2LOGREL(wxCoord x) const { - if (x > 0) - return (wxCoord)((double)(x) / m_scaleX + 0.5); - else - return (wxCoord)((double)(x) / m_scaleX - 0.5); + return wxRound((double)(x) / m_scaleX); } wxCoord YDEV2LOG(wxCoord y) const { - wxCoord new_y = y - m_deviceOriginY; - if (new_y > 0) - return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY; - else - return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY; + return wxRound((double)(y + m_deviceOriginY - m_deviceOffsetY) / m_scaleY) * m_signY + m_logicalOriginY; } wxCoord YDEV2LOGREL(wxCoord y) const { - if (y > 0) - return (wxCoord)((double)(y) / m_scaleY + 0.5); - else - return (wxCoord)((double)(y) / m_scaleY - 0.5); + return wxRound((double)(y) / m_scaleY); } wxCoord XLOG2DEV(wxCoord x) const { - wxCoord new_x = x - m_logicalOriginX; - if (new_x > 0) - return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX; - else - return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX; + return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX; } wxCoord XLOG2DEVREL(wxCoord x) const { - if (x > 0) - return (wxCoord)((double)(x) * m_scaleX + 0.5); - else - return (wxCoord)((double)(x) * m_scaleX - 0.5); + return wxRound((double)(x) * m_scaleX); } wxCoord YLOG2DEV(wxCoord y) const { - wxCoord new_y = y - m_logicalOriginY; - if (new_y > 0) - return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY; - else - return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY; + return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY - m_deviceOriginY + m_deviceOffsetY; } wxCoord YLOG2DEVREL(wxCoord y) const { - if (y > 0) - return (wxCoord)((double)(y) * m_scaleY + 0.5); - else - return (wxCoord)((double)(y) * m_scaleY - 0.5); + return wxRound((double)(y) * m_scaleY); } private: DECLARE_DYNAMIC_CLASS(wxGnomePrintDC) @@ -365,7 +324,7 @@ private: // wxPrintout. // ---------------------------------------------------------------------------- -class wxGnomePreview : public wxPrintPreviewBase +class wxGnomePrintPreview : public wxPrintPreviewBase { public: wxGnomePrintPreview(wxPrintout *printout,