mirror of
https://github.com/aseprite/aseprite.git
synced 2025-04-09 18:44:46 +00:00
Fixed compilation errors in gcc 3.4.
This commit is contained in:
parent
91362d376e
commit
51fdc7184e
@ -24,7 +24,6 @@
|
|||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
|
|
||||||
#include "Vaca/Bind.h"
|
|
||||||
#include "jinete/jinete.h"
|
#include "jinete/jinete.h"
|
||||||
|
|
||||||
#include "app.h"
|
#include "app.h"
|
||||||
@ -127,7 +126,7 @@ StatusBar::StatusBar()
|
|||||||
|
|
||||||
m_commands_box = box1;
|
m_commands_box = box1;
|
||||||
|
|
||||||
App::instance()->CurrentToolChange.connect(Vaca::Bind<void>(&StatusBar::onCurrentToolChange, this));
|
App::instance()->CurrentToolChange.connect(&StatusBar::onCurrentToolChange, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
StatusBar::~StatusBar()
|
StatusBar::~StatusBar()
|
||||||
|
@ -402,7 +402,7 @@ void ToolBar::openPopupWindow(int group_index, ToolGroup* tool_group)
|
|||||||
// In case this tool contains more than just one tool, show the popup window
|
// In case this tool contains more than just one tool, show the popup window
|
||||||
m_open_on_hot = true;
|
m_open_on_hot = true;
|
||||||
m_popup_window = new PopupWindow(NULL, false);
|
m_popup_window = new PopupWindow(NULL, false);
|
||||||
m_popup_window->Close.connect(Vaca::Bind<void>(&ToolBar::onClosePopup, this));
|
m_popup_window->Close.connect(Vaca::Bind<void, ToolBar, ToolBar>(&ToolBar::onClosePopup, this));
|
||||||
|
|
||||||
ToolStrip* toolstrip = new ToolStrip(tool_group, this);
|
ToolStrip* toolstrip = new ToolStrip(tool_group, this);
|
||||||
jwidget_add_child(m_popup_window, toolstrip);
|
jwidget_add_child(m_popup_window, toolstrip);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user