nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compile errors with clang

Browse source
This commit is contained in:
Mathias Gumz 2015-01-21 09:53:54 +01:00
parent d3c960da99
commit 2b70480b97
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ConfigMenu.hh
View file

@ -24,7 +24,7 @@
class BScreen;
class ScreenResource;
struct ScreenResource;
namespace FbTk{
class Menu;
@ -36,6 +36,8 @@ public:
// makes the setup() function-signature shorter
struct SetupHelper {
SetupHelper(BScreen& _s, FbTk::ResourceManager& _rm, ScreenResource& _r) :
screen(_s), rm(_rm), resource(_r) { }
BScreen& screen;
FbTk::ResourceManager& rm;
ScreenResource& resource;

6
src/Screen.cc
View file

@ -1408,11 +1408,7 @@ float BScreen::getYGap(int head) {
void BScreen::setupConfigmenu(FbTk::Menu &menu) {
struct ConfigMenu::SetupHelper sh;
sh.screen = *this;
sh.rm = m_resource_manager;
sh.resource = resource;
struct ConfigMenu::SetupHelper sh(*this, m_resource_manager, resource);
menu.removeAll();
ConfigMenu::setup(menu, sh);
menu.updateMenu();