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

remove test for new dc

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-11-30 20:00:19 +00:00
parent 6b4f4d4731
commit 78cededfdc
2 changed files with 1 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/dcsvg.h
View File

@@ -28,24 +28,13 @@ class WXDLLIMPEXP_FWD_BASE wxFileOutputStream;
#if wxUSE_NEW_DC
class WXDLLIMPEXP_FWD_BASE wxSVGFileDC; class WXDLLIMPEXP_FWD_BASE wxSVGFileDC;
class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
#else
#define wxSVGFileDCImpl wxSVGFileDC
class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
#endif
{ {
public: public:
#if wxUSE_NEW_DC
wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename,
int width=320, int height=240, double dpi=72.0 ); int width=320, int height=240, double dpi=72.0 );
#else
wxSVGFileDC( const wxString &filename,
int width=320, int height=240, double dpi=72.0 );
#endif
virtual ~wxSVGFileDCImpl(); virtual ~wxSVGFileDCImpl();
@@ -107,16 +96,6 @@ public:
virtual void SetFont(const wxFont& font); virtual void SetFont(const wxFont& font);
virtual void SetPen(const wxPen& pen); virtual void SetPen(const wxPen& pen);
#if wxUSE_NEW_DC
#else
virtual void SetMapMode( int mode );
virtual void SetUserScale( double x, double y );
virtual void SetLogicalScale( double x, double y );
virtual void SetLogicalOrigin( wxCoord x, wxCoord y );
virtual void SetDeviceOrigin( wxCoord x, wxCoord y );
virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
#endif
private: private:
virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const
{ {
@@ -221,7 +200,6 @@ private:
}; };
#if wxUSE_NEW_DC
class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC class WXDLLIMPEXP_CORE wxSVGFileDC : public wxDC
{ {
public: public:
@@ -231,8 +209,6 @@ public:
m_pimpl = new wxSVGFileDCImpl( this, filename, width, height, dpi ); m_pimpl = new wxSVGFileDCImpl( this, filename, width, height, dpi );
} }
}; };
#endif
#endif // wxUSE_SVG #endif // wxUSE_SVG

51
src/common/dcsvg.cpp
View File

@@ -76,20 +76,12 @@ wxString wxBrushString ( wxColour c, int style )
IMPLEMENT_ABSTRACT_CLASS(wxSVGFileDCImpl, wxDC) IMPLEMENT_ABSTRACT_CLASS(wxSVGFileDCImpl, wxDC)
#if wxUSE_NEW_DC wxSVGFileDCImpl::wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename,
wxSVGFileDCImpl::wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename,
int width, int height, double dpi ) : int width, int height, double dpi ) :
wxDCImpl( owner ) wxDCImpl( owner )
{ {
Init( filename, width, height, dpi ); Init( filename, width, height, dpi );
} }
#else
wxSVGFileDC::wxSVGFileDC( const wxString &filename,
int width, int height, double dpi )
{
Init( filename, width, height, dpi );
}
#endif
void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, double dpi) void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, double dpi)
{ {
@@ -203,11 +195,7 @@ void wxSVGFileDCImpl::DoDrawPoint (wxCoord x1, wxCoord y1)
void wxSVGFileDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height) void wxSVGFileDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height)
{ {
#if wxUSE_NEW_DC
wxDCImpl::DoDrawCheckMark (x1,y1,width,height) ; wxDCImpl::DoDrawCheckMark (x1,y1,width,height) ;
#else
wxDCBase::DoDrawCheckMark (x1,y1,width,height) ;
#endif
} }
@@ -692,43 +680,6 @@ void wxSVGFileDCImpl::write(const wxString &s)
m_OK = m_outfile->Ok(); m_OK = m_outfile->Ok();
} }
// ---------------------------------------------------------------------------
// coordinates transformations
// ---------------------------------------------------------------------------
#if wxUSE_NEW_DC
#else
void wxSVGFileDCImpl::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
{
wxDCBase::SetAxisOrientation( xLeftRight, yBottomUp );
}
void wxSVGFileDCImpl::SetMapMode(int mode)
{
wxDCBase::SetMapMode(mode);
}
void wxSVGFileDCImpl::SetUserScale(double x, double y)
{
wxDCBase::SetUserScale(x,y);
}
void wxSVGFileDCImpl::SetLogicalScale(double x, double y)
{
wxDCBase::SetLogicalScale(x,y);
}
void wxSVGFileDCImpl::SetLogicalOrigin(wxCoord x, wxCoord y)
{
wxDCBase::SetLogicalOrigin(x,y);
}
void wxSVGFileDCImpl::SetDeviceOrigin(wxCoord x, wxCoord y)
{
wxDCBase::SetDeviceOrigin(x,y);
}
#endif
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma warn .rch #pragma warn .rch