mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Fixed some bugs to make GCC work. I needed to change SimpleValueAction to take the function as a variable as opposed to a template parameter - GCC won't accept pointers from a base class in templates.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@231 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -131,14 +131,14 @@ void RotatedDC::DrawText (const String& text, const RealPoint& pos) {
|
||||
draw_resampled_text(dc, r_ext, revX(), revY(), angle, text);
|
||||
} else {
|
||||
RealPoint p_ext = tr(pos);
|
||||
dc.DrawRotatedText(text, p_ext.x, p_ext.y, angle);
|
||||
dc.DrawRotatedText(text, (int) p_ext.x, (int) p_ext.y, angle);
|
||||
}
|
||||
}
|
||||
|
||||
void RotatedDC::DrawBitmap(const Bitmap& bitmap, const RealPoint& pos) {
|
||||
if (angle == 0) {
|
||||
RealPoint p_ext = tr(pos);
|
||||
dc.DrawBitmap(bitmap, p_ext.x, p_ext.y, true);
|
||||
dc.DrawBitmap(bitmap, (int) p_ext.x, (int) p_ext.y, true);
|
||||
} else {
|
||||
DrawImage(bitmap.ConvertToImage(), pos);
|
||||
}
|
||||
@@ -175,7 +175,7 @@ void RotatedDC::SetFont(const wxFont& font) {
|
||||
SetFont(font, font.GetPointSize());
|
||||
}
|
||||
void RotatedDC::SetFont(wxFont font, double size) {
|
||||
font.SetPointSize(trS(size) * (high_quality ? text_scaling : 1));
|
||||
font.SetPointSize((int) (trS(size) * (high_quality ? text_scaling : 1)));
|
||||
dc.SetFont(font);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user