projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forward WM_{CUT,COPY,PASTE} from edit control to wxComboBox in wxMSW too.
[wxWidgets.git]
/
include
/
wx
/
dc.h
diff --git
a/include/wx/dc.h
b/include/wx/dc.h
index f6346888ace075c14a8262b786829996aba7e057..b519785afa63fcede71bc88eab1f84e55c7df09f 100644
(file)
--- a/
include/wx/dc.h
+++ b/
include/wx/dc.h
@@
-43,6
+43,10
@@
class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
class WXDLLIMPEXP_FWD_CORE wxPrintData;
class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
class WXDLLIMPEXP_FWD_CORE wxPrintData;
+#if wxUSE_GRAPHICS_CONTEXT
+class WXDLLIMPEXP_FWD_CORE wxGraphicsContext;
+#endif
+
// Logical ops
enum wxRasterOperationMode
{
// Logical ops
enum wxRasterOperationMode
{
@@
-471,7
+475,7
@@
public:
}
virtual void SetLogicalScale(double x, double y);
}
virtual void SetLogicalScale(double x, double y);
- virtual void GetLogicalScale(double *x, double *y)
+ virtual void GetLogicalScale(double *x, double *y)
const
{
if ( x ) *x = m_logicalScaleX;
if ( y ) *y = m_logicalScaleY;
{
if ( x ) *x = m_logicalScaleX;
if ( y ) *y = m_logicalScaleY;
@@
-640,6
+644,13
@@
public:
virtual int GetResolution() const
{ return -1; }
virtual int GetResolution() const
{ return -1; }
+#if wxUSE_GRAPHICS_CONTEXT
+ virtual wxGraphicsContext* GetGraphicsContext() const
+ { return NULL; }
+ virtual void SetGraphicsContext( wxGraphicsContext* WXUNUSED(ctx) )
+ {}
+#endif
+
private:
wxDC *m_owner;
private:
wxDC *m_owner;
@@
-1009,7
+1020,7
@@
public:
void SetLogicalScale(double x, double y)
{ m_pimpl->SetLogicalScale( x, y ); }
void SetLogicalScale(double x, double y)
{ m_pimpl->SetLogicalScale( x, y ); }
- void GetLogicalScale(double *x, double *y)
+ void GetLogicalScale(double *x, double *y)
const
{ m_pimpl->GetLogicalScale( x, y ); }
void SetLogicalOrigin(wxCoord x, wxCoord y)
{ m_pimpl->GetLogicalScale( x, y ); }
void SetLogicalOrigin(wxCoord x, wxCoord y)
@@
-1329,6
+1340,17
@@
public:
TempHDC GetTempHDC() { return TempHDC(*this); }
#endif // __WXMSW__
TempHDC GetTempHDC() { return TempHDC(*this); }
#endif // __WXMSW__
+#if wxUSE_GRAPHICS_CONTEXT
+ virtual wxGraphicsContext* GetGraphicsContext() const
+ {
+ return m_pimpl->GetGraphicsContext();
+ }
+ virtual void SetGraphicsContext( wxGraphicsContext* ctx )
+ {
+ m_pimpl->SetGraphicsContext(ctx);
+ }
+#endif
+
protected:
// ctor takes ownership of the pointer
wxDC(wxDCImpl *pimpl) : m_pimpl(pimpl) { }
protected:
// ctor takes ownership of the pointer
wxDC(wxDCImpl *pimpl) : m_pimpl(pimpl) { }