Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make GetPaperRect() and GetResolution() const functions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-11-15 11:10:34 +00:00
parent e9cc4973ff
commit 6d52ca536a
18 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/dc.h
View File

@@ -497,10 +497,10 @@ public:
// --------------------------------------------------------- // ---------------------------------------------------------
// wxPrinterDC Impl API // wxPrinterDC Impl API
virtual wxRect GetPaperRect() virtual wxRect GetPaperRect() const
{ int w = 0; int h = 0; DoGetSize( &w, &h ); return wxRect(0,0,w,h); } { int w = 0; int h = 0; DoGetSize( &w, &h ); return wxRect(0,0,w,h); }
virtual int GetResolution() virtual int GetResolution() const
{ return -1; } { return -1; }
private: private:
@@ -667,7 +667,7 @@ public:
wxSize GetPPI() const wxSize GetPPI() const
{ return m_pimpl->GetPPI(); } { return m_pimpl->GetPPI(); }
virtual int GetResolution() virtual int GetResolution() const
{ return m_pimpl->GetResolution(); } { return m_pimpl->GetResolution(); }
// Right-To-Left (RTL) modes // Right-To-Left (RTL) modes

4
include/wx/dcprint.h
View File

@@ -28,8 +28,8 @@ public:
wxPrinterDC(); wxPrinterDC();
wxPrinterDC(const wxPrintData& data); wxPrinterDC(const wxPrintData& data);
wxRect GetPaperRect(); wxRect GetPaperRect() const;
int GetResolution(); int GetResolution() const;
protected: protected:
wxPrinterDC(wxDCImpl *impl) : wxDC(impl) { } wxPrinterDC(wxDCImpl *impl) : wxDC(impl) { }

4
include/wx/generic/dcpsg.h
View File

@@ -91,8 +91,8 @@ public:
// Overrridden for wxPrinterDC Impl // Overrridden for wxPrinterDC Impl
virtual int GetResolution(); virtual int GetResolution() const;
virtual wxRect GetPaperRect(); virtual wxRect GetPaperRect() const;
protected: protected:
bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style = wxFLOOD_SURFACE); bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style = wxFLOOD_SURFACE);

4
include/wx/gtk/gnome/gprint.h
View File

@@ -289,8 +289,8 @@ protected:
wxPrintData& GetPrintData() { return m_printData; } wxPrintData& GetPrintData() { return m_printData; }
// overriden for wxPrinterDC Impl // overriden for wxPrinterDC Impl
virtual wxRect GetPaperRect(); virtual wxRect GetPaperRect() const;
virtual int GetResolution(); virtual int GetResolution() const;
private: private:
wxPrintData m_printData; wxPrintData m_printData;

4
include/wx/gtk/print.h
View File

@@ -251,8 +251,8 @@ public:
void SetResolution(int ppi); void SetResolution(int ppi);
// overriden for wxPrinterDC Impl // overriden for wxPrinterDC Impl
virtual int GetResolution(); virtual int GetResolution() const;
virtual wxRect GetPaperRect(); virtual wxRect GetPaperRect() const;
protected: protected:
bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE ); bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style=wxFLOOD_SURFACE );

2
include/wx/motif/dcprint.h
View File

@@ -24,7 +24,7 @@ public:
int orientation = wxPORTRAIT); int orientation = wxPORTRAIT);
virtual ~wxPrinterDC(); virtual ~wxPrinterDC();
wxRect GetPaperRect(); wxRect GetPaperRect() const;
DECLARE_CLASS(wxPrinterDCImpl) DECLARE_CLASS(wxPrinterDCImpl)
}; };

2
include/wx/msw/dcprint.h
View File

@@ -35,7 +35,7 @@ public:
virtual void StartPage(); virtual void StartPage();
virtual void EndPage(); virtual void EndPage();
virtual wxRect GetPaperRect(); virtual wxRect GetPaperRect() const;
protected: protected:
virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,

2
include/wx/os2/dcprint.h
View File

@@ -33,7 +33,7 @@ class WXDLLIMPEXP_CORE wxPrinterDCImpl: public wxPMDCImpl
virtual void StartPage(void); virtual void StartPage(void);
virtual void EndPage(void); virtual void EndPage(void);
virtual wxRect GetPaperRect(); virtual wxRect GetPaperRect() const;
protected: protected:
virtual void DoDrawBitmap( const wxBitmap& rBmp virtual void DoDrawBitmap( const wxBitmap& rBmp

2
include/wx/osx/carbon/dcprint.h
View File

@@ -31,7 +31,7 @@ public:
virtual void StartPage(void) ; virtual void StartPage(void) ;
virtual void EndPage(void) ; virtual void EndPage(void) ;
wxRect GetPaperRect(); wxRect GetPaperRect() const;
wxPrintData& GetPrintData() { return m_printData; } wxPrintData& GetPrintData() { return m_printData; }
virtual wxSize GetPPI() const; virtual wxSize GetPPI() const;

2
include/wx/palmos/dcprint.h
View File

@@ -34,7 +34,7 @@ public:
virtual void StartPage(); virtual void StartPage();
virtual void EndPage(); virtual void EndPage();
wxRect GetPaperRect(); wxRect GetPaperRect() const;
protected: protected:
virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,

4
src/common/dcbase.cpp
View File

@@ -300,12 +300,12 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& data)
{ {
} }
wxRect wxPrinterDC::GetPaperRect() wxRect wxPrinterDC::GetPaperRect() const
{ {
return GetImpl()->GetPaperRect(); return GetImpl()->GetPaperRect();
} }
int wxPrinterDC::GetResolution() int wxPrinterDC::GetResolution() const
{ {
return GetImpl()->GetResolution(); return GetImpl()->GetResolution();
} }

4
src/generic/dcpsg.cpp
View File

@@ -342,7 +342,7 @@ bool wxPostScriptDCImpl::IsOk() const
return m_ok; return m_ok;
} }
wxRect wxPostScriptDCImpl::GetPaperRect() wxRect wxPostScriptDCImpl::GetPaperRect() const
{ {
int w = 0; int w = 0;
int h = 0; int h = 0;
@@ -350,7 +350,7 @@ wxRect wxPostScriptDCImpl::GetPaperRect()
return wxRect(0,0,w,h); return wxRect(0,0,w,h);
} }
int wxPostScriptDCImpl::GetResolution() int wxPostScriptDCImpl::GetResolution() const
{ {
return DPI; return DPI;
} }

4
src/gtk/gnome/gprint.cpp
View File

@@ -2015,12 +2015,12 @@ void wxGnomePrinterDCImpl::SetPrintData(const wxPrintData& data)
// overridden for wxPrinterDC Impl // overridden for wxPrinterDC Impl
int wxGnomePrinterDCImpl::GetResolution() int wxGnomePrinterDCImpl::GetResolution() const
{ {
return DPI; return DPI;
} }
wxRect wxGnomePrinterDCImpl::GetPaperRect() wxRect wxGnomePrinterDCImpl::GetPaperRect() const
{ {
// GNOME print doesn't support printer margins // GNOME print doesn't support printer margins
int w = 0; int w = 0;

4
src/gtk/print.cpp
View File

@@ -2251,7 +2251,7 @@ void wxGtkPrinterDCImpl::SetPrintData(const wxPrintData& data)
// overriden for wxPrinterDC Impl // overriden for wxPrinterDC Impl
wxRect wxGtkPrinterDCImpl::GetPaperRect() wxRect wxGtkPrinterDCImpl::GetPaperRect() const
{ {
// Does GtkPrint support printer margins? // Does GtkPrint support printer margins?
int w = 0; int w = 0;
@@ -2260,7 +2260,7 @@ wxRect wxGtkPrinterDCImpl::GetPaperRect()
return wxRect( 0,0,w,h ); return wxRect( 0,0,w,h );
} }
int wxGtkPrinterDCImpl::GetResolution() int wxGtkPrinterDCImpl::GetResolution() const
{ {
return m_resolution; return m_resolution;
} }

2
src/msw/dcprint.cpp
View File

@@ -228,7 +228,7 @@ void wxPrinterDCImpl::EndPage()
} }
wxRect wxPrinterDCImpl::GetPaperRect() wxRect wxPrinterDCImpl::GetPaperRect() const
{ {
if (!IsOk()) return wxRect(0, 0, 0, 0); if (!IsOk()) return wxRect(0, 0, 0, 0);

2
src/os2/dcprint.cpp
View File

@@ -138,7 +138,7 @@ void wxPrinterDCImpl::EndPage()
// ::EndPage((HDC) m_hDC); // ::EndPage((HDC) m_hDC);
} // end of wxPrinterDC::EndPage } // end of wxPrinterDC::EndPage
wxRect wxPrinterDCImpl::GetPaperRect() wxRect wxPrinterDCImpl::GetPaperRect() const
{ {
// Use page rect if we can't get paper rect. // Use page rect if we can't get paper rect.
wxCoord w, h; wxCoord w, h;

2
src/osx/carbon/dcprint.cpp
View File

@@ -344,7 +344,7 @@ void wxPrinterDCImpl::EndDoc(void)
} }
} }
wxRect wxPrinterDCImpl::GetPaperRect() wxRect wxPrinterDCImpl::GetPaperRect() const
{ {
wxCoord w, h; wxCoord w, h;
GetOwner()->GetSize(&w, &h); GetOwner()->GetSize(&w, &h);

2
src/palmos/dcprint.cpp
View File

@@ -100,7 +100,7 @@ void wxPrinterDC::EndPage()
{ {
} }
wxRect wxPrinterDC::GetPaperRect() wxRect wxPrinterDC::GetPaperRect() const
{ {
// Use page rect if we can't get paper rect. // Use page rect if we can't get paper rect.
wxCoord w, h; wxCoord w, h;