diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index eb5139171..bcfefb397 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -1727,9 +1727,9 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info) EpgButtons[TV_BUTTONS][3].button = NEUTRINO_ICON_BUTTON_DUMMY_SMALL; if (g_settings.recording_type != CNeutrinoApp::RECORDING_OFF) - ::paintButtons(x, y, w, MaxButtons, EpgButtons[TV_BUTTONS], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 2); + ::paintButtons(x, y, w, MaxButtons, EpgButtons[TV_BUTTONS], w, h, false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 2); else // don't show recording button - ::paintButtons(x, y, w, MaxButtons, &EpgButtons[TV_BUTTONS][1], w, h, "", false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 1); + ::paintButtons(x, y, w, MaxButtons, &EpgButtons[TV_BUTTONS][1], w, h, false, COL_MENUFOOT_TEXT, adzap ? adzap_button.c_str() : NULL, 1); } } diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index 59d0e6972..3a65445c8 100644 --- a/src/gui/pictureviewer.cpp +++ b/src/gui/pictureviewer.cpp @@ -180,8 +180,8 @@ int CPictureViewerGui::exec(CMenuTarget* parent, const std::string & actionKey) item_height = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); //get footer_height from paintButtons - buttons1_height = ::paintButtons(0, 0, 0, PictureViewerButtons1Count, PictureViewerButtons1, 0, 0, "", false, COL_MENUFOOT_TEXT, NULL, 0, false); - buttons2_height = ::paintButtons(0, 0, 0, PictureViewerButtons2Count, PictureViewerButtons2, 0, 0, "", false, COL_MENUFOOT_TEXT, NULL, 0, false); + buttons1_height = ::paintButtons(0, 0, 0, PictureViewerButtons1Count, PictureViewerButtons1, 0, 0, false, COL_MENUFOOT_TEXT, NULL, 0, false); + buttons2_height = ::paintButtons(0, 0, 0, PictureViewerButtons2Count, PictureViewerButtons2, 0, 0, false, COL_MENUFOOT_TEXT, NULL, 0, false); footer_height = buttons1_height + buttons2_height; listmaxshow = (height - header_height - footer_height - OFFSET_SHADOW)/item_height; diff --git a/src/gui/widget/buttons.cpp b/src/gui/widget/buttons.cpp index f9f4680cb..4e8bbe2d1 100644 --- a/src/gui/widget/buttons.cpp +++ b/src/gui/widget/buttons.cpp @@ -296,13 +296,11 @@ int paintButtons( const int &x, const struct button_label * const content, const int &maxwidth, const int &footerheight, - std::string /* just to make sure nobody uses anything below */, bool vertical_paint, const uint32_t fcolor, const char * alt_buttontext, const uint &buttontext_id, - bool show, - const std::vector& /*all_buttontext_id*/) + bool show) { CFrameBuffer *frameBuffer = CFrameBuffer::getInstance(); Font * font = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]; diff --git a/src/gui/widget/buttons.h b/src/gui/widget/buttons.h index 6cbfeaced..04fdc5499 100644 --- a/src/gui/widget/buttons.h +++ b/src/gui/widget/buttons.h @@ -79,12 +79,10 @@ int paintButtons( const int &x, const struct button_label * const content, const int &maxwidth, const int &footerheight = 0, - std::string tmp = "", /* just to make sure compilation breaks */ bool vertical_paint = false, const uint32_t fcolor = COL_MENUFOOT_TEXT, const char * alt_buttontext = NULL, const uint &buttontext_id = 0, - bool show = true, - const std::vector& all_buttontext_id = std::vector()); + bool show = true); #endif /* __gui_widget_buttons_h__ */