amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-13 14:07:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

compatibility with wxWdigets 2.9+: SetLogicalFunction takes wxRasterOperationMode instead of int

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1529 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2010-12-07 21:05:00 +00:00
parent 65cde6c8f3
commit 6f922eac7d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/rotation.cpp
+2 -2
View File
@@ -332,7 +332,7 @@ void RotatedDC::DrawEllipticSpoke(const RealPoint& center, const RealSize& size,
void RotatedDC::SetPen(const wxPen& pen) { dc.SetPen(pen); } void RotatedDC::SetPen(const wxPen& pen) { dc.SetPen(pen); }
void RotatedDC::SetBrush(const wxBrush& brush) { dc.SetBrush(brush); } void RotatedDC::SetBrush(const wxBrush& brush) { dc.SetBrush(brush); }
void RotatedDC::SetTextForeground(const Color& color) { dc.SetTextForeground(color); } void RotatedDC::SetTextForeground(const Color& color) { dc.SetTextForeground(color); }
void RotatedDC::SetLogicalFunction(int function) { dc.SetLogicalFunction(function); } void RotatedDC::SetLogicalFunction(wxRasterOperationMode function) { dc.SetLogicalFunction(function); }
void RotatedDC::SetFont(const wxFont& font) { void RotatedDC::SetFont(const wxFont& font) {
if (quality == QUALITY_LOW && zoomX == 1 && zoomY == 1) { if (quality == QUALITY_LOW && zoomX == 1 && zoomY == 1) {
@@ -391,7 +391,7 @@ double RotatedDC::GetCharHeight() const {
} }
void RotatedDC::SetClippingRegion(const RealRect& rect) { void RotatedDC::SetClippingRegion(const RealRect& rect) {
dc.SetClippingRegion(trRectToRegion(rect)); dc.SetDeviceClippingRegion(trRectToRegion(rect));
} }
void RotatedDC::DestroyClippingRegion() { void RotatedDC::DestroyClippingRegion() {
dc.DestroyClippingRegion(); dc.DestroyClippingRegion();
src/util/rotation.hpp
+6 -1
View File
@@ -155,6 +155,11 @@ enum RenderQuality {
QUALITY_AA, ///< Our own anti aliassing QUALITY_AA, ///< Our own anti aliassing
}; };
#if wxVERSION_NUMBER < 2900
// argument type to SetLogicalFunction
typedef int wxRasterOperationMode;
#endif
/// A DC with rotation applied /// A DC with rotation applied
/** All draw** functions take internal coordinates. /** All draw** functions take internal coordinates.
*/ */
@@ -198,7 +203,7 @@ class RotatedDC : public Rotation {
void SetPen(const wxPen&); void SetPen(const wxPen&);
void SetBrush(const wxBrush&); void SetBrush(const wxBrush&);
void SetTextForeground(const Color&); void SetTextForeground(const Color&);
void SetLogicalFunction(int function); void SetLogicalFunction(wxRasterOperationMode function);
void SetFont(const wxFont& font); void SetFont(const wxFont& font);
/// Set the font, scales for zoom and high_quality /// Set the font, scales for zoom and high_quality