projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxXmlNode::GetAttribute's pointer argument must not be NULL, check for it
[wxWidgets.git]
/
src
/
common
/
graphcmn.cpp
diff --git
a/src/common/graphcmn.cpp
b/src/common/graphcmn.cpp
index 91894232e424a6e8579a5aa99cfc0d8d16612e03..4095bb95a9046faeb9e56fc1ee67e3eedafc98d5 100644
(file)
--- a/
src/common/graphcmn.cpp
+++ b/
src/common/graphcmn.cpp
@@
-147,6
+147,13
@@
void wxGraphicsMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d,
GetMatrixData()->Set(a,b,c,d,tx,ty);
}
GetMatrixData()->Set(a,b,c,d,tx,ty);
}
+// gets the component valuess of the matrix
+void wxGraphicsMatrix::Get(wxDouble* a, wxDouble* b, wxDouble* c,
+ wxDouble* d, wxDouble* tx, wxDouble* ty) const
+{
+ GetMatrixData()->Get(a, b, c, d, tx, ty);
+}
+
// makes this the inverse matrix
void wxGraphicsMatrix::Invert()
{
// makes this the inverse matrix
void wxGraphicsMatrix::Invert()
{
@@
-495,6
+502,7
@@
IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject)
wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer)
{
wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer)
{
+ m_logicalFunction = wxCOPY;
}
wxGraphicsContext::~wxGraphicsContext()
}
wxGraphicsContext::~wxGraphicsContext()
@@
-535,6
+543,16
@@
void wxGraphicsContext::SetFont( const wxGraphicsFont& font )
m_font = font;
}
m_font = font;
}
+bool wxGraphicsContext::SetLogicalFunction( int function )
+{
+ if ( function == wxCOPY )
+ {
+ m_logicalFunction = function;
+ return true;
+ }
+ return false;
+}
+
void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
{
if ( font.Ok() )
void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour )
{
if ( font.Ok() )
@@
-707,6
+725,12
@@
wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc)
{
return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
}
{
return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
}
+#ifdef __WXMSW__
+wxGraphicsContext* wxGraphicsContext::Create( const wxMemoryDC& dc)
+{
+ return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc);
+}
+#endif
wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
{
wxGraphicsContext* wxGraphicsContext::CreateFromNative( void * context )
{