Added wxGCDC(wxEnhMetaFileDC) ctor too.
Make it possible to create wxGCDC associated with a metafile DC in wxMSW too. Closes #13326. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -450,6 +450,10 @@ GTK:
|
|||||||
|
|
||||||
- Generate events for two auxiliary mouse buttons in wxGTK (Marcin Wojdyr).
|
- Generate events for two auxiliary mouse buttons in wxGTK (Marcin Wojdyr).
|
||||||
|
|
||||||
|
MSW:
|
||||||
|
|
||||||
|
- Added wxGCDC(wxEnhMetaFileDC) ctor (Marcin Wojdyr).
|
||||||
|
|
||||||
|
|
||||||
2.9.2: (released 2011-07-05)
|
2.9.2: (released 2011-07-05)
|
||||||
------
|
------
|
||||||
|
@@ -28,6 +28,9 @@ public:
|
|||||||
wxGCDC( const wxMemoryDC& dc );
|
wxGCDC( const wxMemoryDC& dc );
|
||||||
#if wxUSE_PRINTING_ARCHITECTURE
|
#if wxUSE_PRINTING_ARCHITECTURE
|
||||||
wxGCDC( const wxPrinterDC& dc );
|
wxGCDC( const wxPrinterDC& dc );
|
||||||
|
#endif
|
||||||
|
#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
|
||||||
|
wxGCDC( const wxEnhMetaFileDC& dc );
|
||||||
#endif
|
#endif
|
||||||
wxGCDC();
|
wxGCDC();
|
||||||
virtual ~wxGCDC();
|
virtual ~wxGCDC();
|
||||||
@@ -55,6 +58,9 @@ public:
|
|||||||
wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc );
|
wxGCDCImpl( wxDC *owner, const wxMemoryDC& dc );
|
||||||
#if wxUSE_PRINTING_ARCHITECTURE
|
#if wxUSE_PRINTING_ARCHITECTURE
|
||||||
wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
|
wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc );
|
||||||
|
#endif
|
||||||
|
#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
|
||||||
|
wxGCDCImpl( wxDC *owner, const wxEnhMetaFileDC& dc );
|
||||||
#endif
|
#endif
|
||||||
wxGCDCImpl( wxDC *owner );
|
wxGCDCImpl( wxDC *owner );
|
||||||
|
|
||||||
|
@@ -35,6 +35,17 @@ public:
|
|||||||
*/
|
*/
|
||||||
wxGCDC( const wxPrinterDC& dc );
|
wxGCDC( const wxPrinterDC& dc );
|
||||||
|
|
||||||
|
/**
|
||||||
|
Constructs a wxGCDC from a wxEnhMetaFileDC.
|
||||||
|
|
||||||
|
This constructor is only available in wxMSW port and when @c
|
||||||
|
wxUSE_ENH_METAFILE build option is enabled, i.e. when wxEnhMetaFileDC
|
||||||
|
class itself is available.
|
||||||
|
|
||||||
|
@since 2.9.3
|
||||||
|
*/
|
||||||
|
wxGCDC( const wxEnhMetaFileDC& dc );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Retrieves associated wxGraphicsContext
|
Retrieves associated wxGraphicsContext
|
||||||
*/
|
*/
|
||||||
|
@@ -114,6 +114,13 @@ wxGCDC::wxGCDC( const wxPrinterDC& dc) :
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
|
||||||
|
wxGCDC::wxGCDC(const wxEnhMetaFileDC& dc)
|
||||||
|
: wxDC(new wxGCDCImpl(this, dc))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
wxGCDC::wxGCDC() :
|
wxGCDC::wxGCDC() :
|
||||||
wxDC( new wxGCDCImpl( this ) )
|
wxDC( new wxGCDCImpl( this ) )
|
||||||
{
|
{
|
||||||
@@ -193,6 +200,15 @@ wxGCDCImpl::wxGCDCImpl( wxDC *owner, const wxPrinterDC& dc ) :
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
|
||||||
|
wxGCDCImpl::wxGCDCImpl(wxDC *owner, const wxEnhMetaFileDC& dc)
|
||||||
|
: wxDCImpl(owner)
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
SetGraphicsContext(wxGraphicsContext::Create(dc));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void wxGCDCImpl::Init()
|
void wxGCDCImpl::Init()
|
||||||
{
|
{
|
||||||
m_ok = false;
|
m_ok = false;
|
||||||
|
Reference in New Issue
Block a user