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

Interface tweaks for Phoenix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-10-13 06:40:10 +00:00
parent 7364317521
commit e33cc297dd
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
interface/wx/graphics.h
View File

@@ -356,14 +356,14 @@ public:
@see wxGraphicsRenderer::CreateContext() @see wxGraphicsRenderer::CreateContext()
*/ */
static wxGraphicsContext* Create(const wxWindowDC& dc); static wxGraphicsContext* Create(const wxWindowDC& windowDC);
/** /**
Creates a wxGraphicsContext from a wxMemoryDC Creates a wxGraphicsContext from a wxMemoryDC
@see wxGraphicsRenderer::CreateContext() @see wxGraphicsRenderer::CreateContext()
*/ */
static wxGraphicsContext* Create(const wxMemoryDC& dc); static wxGraphicsContext* Create(const wxMemoryDC& memoryDC);
/** /**
Creates a wxGraphicsContext from a wxPrinterDC. Under GTK+, this will Creates a wxGraphicsContext from a wxPrinterDC. Under GTK+, this will
@@ -372,7 +372,7 @@ public:
@see wxGraphicsRenderer::CreateContext(), @ref overview_unixprinting @see wxGraphicsRenderer::CreateContext(), @ref overview_unixprinting
*/ */
static wxGraphicsContext* Create(const wxPrinterDC& dc); static wxGraphicsContext* Create(const wxPrinterDC& printerDC);
/** /**
Creates a wxGraphicsContext from a wxEnhMetaFileDC. Creates a wxGraphicsContext from a wxEnhMetaFileDC.
@@ -382,7 +382,7 @@ public:
@see wxGraphicsRenderer::CreateContext() @see wxGraphicsRenderer::CreateContext()
*/ */
static wxGraphicsContext* Create(const wxEnhMetaFileDC& dc); static wxGraphicsContext* Create(const wxEnhMetaFileDC& metaFileDC);
/** /**
Creates a wxGraphicsContext associated with a wxImage. Creates a wxGraphicsContext associated with a wxImage.
@@ -806,6 +806,11 @@ public:
*/ */
virtual wxCompositionMode GetCompositionMode() const; virtual wxCompositionMode GetCompositionMode() const;
virtual void EnableOffset(bool enable = true);
void DisableOffset();
bool OffsetEnabled();
}; };
/** /**
@@ -981,17 +986,17 @@ public:
/** /**
Creates a wxGraphicsContext from a wxWindowDC Creates a wxGraphicsContext from a wxWindowDC
*/ */
virtual wxGraphicsContext* CreateContext(const wxWindowDC& dc) = 0 ; virtual wxGraphicsContext* CreateContext(const wxWindowDC& windowDC) = 0 ;
/** /**
Creates a wxGraphicsContext from a wxMemoryDC Creates a wxGraphicsContext from a wxMemoryDC
*/ */
virtual wxGraphicsContext* CreateContext(const wxMemoryDC& dc) = 0 ; virtual wxGraphicsContext* CreateContext(const wxMemoryDC& memoryDC) = 0 ;
/** /**
Creates a wxGraphicsContext from a wxPrinterDC Creates a wxGraphicsContext from a wxPrinterDC
*/ */
virtual wxGraphicsContext* CreateContext(const wxPrinterDC& dc) = 0 ; virtual wxGraphicsContext* CreateContext(const wxPrinterDC& printerDC) = 0 ;
/** /**
Creates a wxGraphicsContext from a wxEnhMetaFileDC. Creates a wxGraphicsContext from a wxEnhMetaFileDC.
@@ -999,7 +1004,7 @@ public:
This function, as wxEnhMetaFileDC class itself, is only available only This function, as wxEnhMetaFileDC class itself, is only available only
under MSW. under MSW.
*/ */
virtual wxGraphicsContext* CreateContext(const wxEnhMetaFileDC& dc) = 0; virtual wxGraphicsContext* CreateContext(const wxEnhMetaFileDC& metaFileDC) = 0;
/** /**
Creates a wxGraphicsContext associated with a wxImage. Creates a wxGraphicsContext associated with a wxImage.
@@ -1128,6 +1133,8 @@ public:
on GTK we currently default to the cairo renderer. on GTK we currently default to the cairo renderer.
*/ */
static wxGraphicsRenderer* GetDefaultRenderer(); static wxGraphicsRenderer* GetDefaultRenderer();
static wxGraphicsRenderer* GetCairoRenderer();
}; };
@@ -1283,3 +1290,10 @@ public:
virtual void Translate(wxDouble dx, wxDouble dy); virtual void Translate(wxDouble dx, wxDouble dy);
}; };
const wxGraphicsPen wxNullGraphicsPen;
const wxGraphicsBrush wxNullGraphicsBrush;
const wxGraphicsFont wxNullGraphicsFont;
const wxGraphicsBitmap wxNullGraphicsBitmap;
const wxGraphicsMatrix wxNullGraphicsMatrix;
const wxGraphicsPath wxNullGraphicsPath;