From efb825c623a2044f68b2f2ed61782e220ff45feb Mon Sep 17 00:00:00 2001 From: Andreas Butti Date: Sun, 25 Nov 2018 16:37:03 +0100 Subject: [PATCH] Fixed Build error --- src/control/Control.cpp | 2 +- src/control/PageBackgroundChangeController.cpp | 2 +- src/control/pagetype/PageTypeMenu.cpp | 2 +- src/control/pagetype/PageTypeMenu.h | 2 +- src/gui/dialog/PageTemplateDialog.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/control/Control.cpp b/src/control/Control.cpp index 128a2606..4f7259dd 100644 --- a/src/control/Control.cpp +++ b/src/control/Control.cpp @@ -98,7 +98,7 @@ Control::Control(GladeSearchpath* gladeSearchPath) this->settings->load(); this->pageTypes = new PageTypeHandler(gladeSearchPath); - this->newPageType = new PageTypeMenu(this->pageTypes, true, settings); + this->newPageType = new PageTypeMenu(this->pageTypes, settings, true, true); this->sidebar = NULL; this->searchBar = NULL; diff --git a/src/control/PageBackgroundChangeController.cpp b/src/control/PageBackgroundChangeController.cpp index 17f2c5b1..6f51dae1 100644 --- a/src/control/PageBackgroundChangeController.cpp +++ b/src/control/PageBackgroundChangeController.cpp @@ -13,7 +13,7 @@ PageBackgroundChangeController::PageBackgroundChangeController(Control* control) : control(control), - currentPageType(new PageTypeMenu(control->getPageTypes(), false, control->getSettings())), + currentPageType(new PageTypeMenu(control->getPageTypes(), control->getSettings(), false, true)), ignoreEvent(false) { XOJ_INIT_TYPE(PageBackgroundChangeController); diff --git a/src/control/pagetype/PageTypeMenu.cpp b/src/control/pagetype/PageTypeMenu.cpp index 52dc2c23..a9409c98 100644 --- a/src/control/pagetype/PageTypeMenu.cpp +++ b/src/control/pagetype/PageTypeMenu.cpp @@ -14,7 +14,7 @@ PageTypeMenuChangeListener::~PageTypeMenuChangeListener() {} #define PREVIEW_COLUMNS 3 -PageTypeMenu::PageTypeMenu(PageTypeHandler* types, bool showPreview, Settings* settings, bool showSpecial) +PageTypeMenu::PageTypeMenu(PageTypeHandler* types, Settings* settings, bool showPreview, bool showSpecial) : showSpecial(showSpecial), menu(gtk_menu_new()), types(types), diff --git a/src/control/pagetype/PageTypeMenu.h b/src/control/pagetype/PageTypeMenu.h index fb6461d3..5f2043c3 100644 --- a/src/control/pagetype/PageTypeMenu.h +++ b/src/control/pagetype/PageTypeMenu.h @@ -41,7 +41,7 @@ public: class PageTypeMenu { public: - PageTypeMenu(PageTypeHandler* types, bool showPreview, Settings* settings, bool showSpecial = true); + PageTypeMenu(PageTypeHandler* types, Settings* settings, bool showPreview, bool showSpecial); virtual ~PageTypeMenu(); public: diff --git a/src/gui/dialog/PageTemplateDialog.cpp b/src/gui/dialog/PageTemplateDialog.cpp index d86978bc..efd1d828 100644 --- a/src/gui/dialog/PageTemplateDialog.cpp +++ b/src/gui/dialog/PageTemplateDialog.cpp @@ -79,7 +79,7 @@ static void menu_position_func(GtkMenu* menu, int* x, int* y, gboolean* push_in, PageTemplateDialog::PageTemplateDialog(GladeSearchpath* gladeSearchPath, Settings* settings, PageTypeHandler* types) : GladeGui(gladeSearchPath, "pageTemplate.glade", "templateDialog"), settings(settings), - pageMenu(new PageTypeMenu(types, settings, false)), + pageMenu(new PageTypeMenu(types, settings, false, false)), saved(false) { XOJ_INIT_TYPE(PageTemplateDialog);