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

wxUSE_SPLINES markup and other cleanings.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-09-15 15:26:27 +00:00
parent b11729f149
commit 389076f148
6 changed files with 570 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dcps.h // Name: wx/generic/dcps.h
// Purpose: wxPostScriptDC class // Purpose: wxPostScriptDC class
// Author: Julian Smart and others // Author: Julian Smart and others
// Modified by: // Modified by:
@@ -66,8 +66,9 @@ public:
void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20); void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20);
void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
#if wxUSE_SPLINES
void DoDrawSpline(wxList *points); void DoDrawSpline(wxList *points);
#endif // wxUSE_SPLINES
bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,
wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);

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

@@ -1,8 +1,9 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: gprint.h // Name: wx/gtk/gnome/gprint.h
// Author: Robert Roebling // Author: Robert Roebling
// Purpose: GNOME printing support // Purpose: GNOME printing support
// Created: 09/20/04 // Created: 09/20/04
// RCS-ID: $Id$
// Copyright: Robert Roebling // Copyright: Robert Roebling
// Licence: wxWindows Licence // Licence: wxWindows Licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -223,7 +224,9 @@ public:
void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0); void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0);
void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
#if wxUSE_SPLINES
void DoDrawSpline(wxList *points); void DoDrawSpline(wxList *points);
#endif // wxUSE_SPLINES
bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,

5
include/wx/gtk1/gnome/gprint.h
View File

@@ -1,8 +1,9 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: gprint.h // Name: wx/gtk/gnome/gprint.h
// Author: Robert Roebling // Author: Robert Roebling
// Purpose: GNOME printing support // Purpose: GNOME printing support
// Created: 09/20/04 // Created: 09/20/04
// RCS-ID: $Id$
// Copyright: Robert Roebling // Copyright: Robert Roebling
// Licence: wxWindows Licence // Licence: wxWindows Licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -223,7 +224,9 @@ public:
void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0); void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0);
void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
#if wxUSE_SPLINES
void DoDrawSpline(wxList *points); void DoDrawSpline(wxList *points);
#endif // wxUSE_SPLINES
bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop = wxCOPY, bool useMask = false,

4
src/generic/dcpsg.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: dcpsg.cpp // Name: src/generic/dcpsg.cpp
// Purpose: Generic wxPostScriptDC implementation // Purpose: Generic wxPostScriptDC implementation
// Author: Julian Smart, Robert Roebling, Markus Holzhem // Author: Julian Smart, Robert Roebling, Markus Holzhem
// Modified by: // Modified by:
@@ -1385,6 +1385,7 @@ void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function))
wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") ); wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") );
} }
#if wxUSE_SPLINES
void wxPostScriptDC::DoDrawSpline( wxList *points ) void wxPostScriptDC::DoDrawSpline( wxList *points )
{ {
wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
@@ -1459,6 +1460,7 @@ void wxPostScriptDC::DoDrawSpline( wxList *points )
wxT("stroke\n"), wxT("stroke\n"),
LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) ); LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) );
} }
#endif // wxUSE_SPLINES
wxCoord wxPostScriptDC::GetCharWidth() const wxCoord wxPostScriptDC::GetCharWidth() const
{ {

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

@@ -1,8 +1,9 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: gprint.cpp // Name: src/gtk/gnome/gprint.cpp
// Author: Robert Roebling // Author: Robert Roebling
// Purpose: Implement GNOME printing support // Purpose: Implement GNOME printing support
// Created: 09/20/04 // Created: 09/20/04
// RCS-ID: $Id$
// Copyright: Robert Roebling // Copyright: Robert Roebling
// Licence: wxWindows Licence // Licence: wxWindows Licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -1212,6 +1213,7 @@ void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord
} }
} }
#if wxUSE_SPLINES
void wxGnomePrintDC::DoDrawSpline(wxList *points) void wxGnomePrintDC::DoDrawSpline(wxList *points)
{ {
SetPen (m_pen); SetPen (m_pen);
@@ -1269,6 +1271,7 @@ void wxGnomePrintDC::DoDrawSpline(wxList *points)
gs_lgp->gnome_print_stroke( m_gpc ); gs_lgp->gnome_print_stroke( m_gpc );
} }
#endif // wxUSE_SPLINES
bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask,
@@ -1652,7 +1655,7 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC
if ( externalLeading ) if ( externalLeading )
*externalLeading = 0; *externalLeading = 0;
if (string.IsEmpty()) if (string.empty())
{ {
return; return;
} }

7
src/gtk1/gnome/gprint.cpp
View File

@@ -1,8 +1,9 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: gprint.cpp // Name: src/gtk/gnome/gprint.cpp
// Author: Robert Roebling // Author: Robert Roebling
// Purpose: Implement GNOME printing support // Purpose: Implement GNOME printing support
// Created: 09/20/04 // Created: 09/20/04
// RCS-ID: $Id$
// Copyright: Robert Roebling // Copyright: Robert Roebling
// Licence: wxWindows Licence // Licence: wxWindows Licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -1212,6 +1213,7 @@ void wxGnomePrintDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord
} }
} }
#if wxUSE_SPLINES
void wxGnomePrintDC::DoDrawSpline(wxList *points) void wxGnomePrintDC::DoDrawSpline(wxList *points)
{ {
SetPen (m_pen); SetPen (m_pen);
@@ -1269,6 +1271,7 @@ void wxGnomePrintDC::DoDrawSpline(wxList *points)
gs_lgp->gnome_print_stroke( m_gpc ); gs_lgp->gnome_print_stroke( m_gpc );
} }
#endif // wxUSE_SPLINES
bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask,
@@ -1652,7 +1655,7 @@ void wxGnomePrintDC::DoGetTextExtent(const wxString& string, wxCoord *width, wxC
if ( externalLeading ) if ( externalLeading )
*externalLeading = 0; *externalLeading = 0;
if (string.IsEmpty()) if (string.empty())
{ {
return; return;
} }