Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
magicseteditor
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
magicseteditor
Commits
e30e4152
Commit
e30e4152
authored
Dec 07, 2010
by
twanvl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compatibility with wxWdigets 2.9+: SetLogicalFunction takes wxRasterOperationMode instead of int
parent
015b5a16
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
src/util/rotation.cpp
src/util/rotation.cpp
+2
-2
src/util/rotation.hpp
src/util/rotation.hpp
+6
-1
No files found.
src/util/rotation.cpp
View file @
e30e4152
...
@@ -332,7 +332,7 @@ void RotatedDC::DrawEllipticSpoke(const RealPoint& center, const RealSize& size,
...
@@ -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 {
...
@@ -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
.
Set
Device
ClippingRegion
(
trRectToRegion
(
rect
));
}
}
void
RotatedDC
::
DestroyClippingRegion
()
{
void
RotatedDC
::
DestroyClippingRegion
()
{
dc
.
DestroyClippingRegion
();
dc
.
DestroyClippingRegion
();
...
...
src/util/rotation.hpp
View file @
e30e4152
...
@@ -155,6 +155,11 @@ enum RenderQuality {
...
@@ -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 {
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment