mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-13 14:07:01 -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:
@@ -16,8 +16,8 @@
|
||||
|
||||
SymbolBasicShapeEditor::SymbolBasicShapeEditor(SymbolControl* control)
|
||||
: SymbolEditorBase(control)
|
||||
, drawing(false)
|
||||
, mode(ID_SHAPE_CIRCLE)
|
||||
, drawing(false)
|
||||
{
|
||||
control->SetCursor(*wxCROSS_CURSOR);
|
||||
}
|
||||
|
||||
@@ -152,7 +152,7 @@ void SymbolControl::draw(DC& dc) {
|
||||
wxSize s = dc.GetSize();
|
||||
int lines = settings.symbol_grid_size;
|
||||
for (int i = 0 ; i <= lines ; ++i) {
|
||||
int x = rotation.trS((double)i/lines-0.0001);
|
||||
int x = (int) rotation.trS(i/lines-0.0001);
|
||||
//dc.SetPen(Color(0, i%5 == 0 ? 64 : 31, 0));
|
||||
//dc.SetPen(Color(i%5 == 0 ? 64 : 31, 0, 0));
|
||||
dc.SetLogicalFunction(wxAND);
|
||||
@@ -270,4 +270,4 @@ BEGIN_EVENT_TABLE(SymbolControl, wxControl)
|
||||
EVT_KEY_UP (SymbolControl::onKeyChange)
|
||||
EVT_KEY_DOWN (SymbolControl::onKeyChange)
|
||||
EVT_CHAR (SymbolControl::onChar)
|
||||
END_EVENT_TABLE ()
|
||||
END_EVENT_TABLE ()
|
||||
|
||||
Reference in New Issue
Block a user