Fixed Build error

presentation
Andreas Butti 7 years ago
parent 8dd26b6254
commit efb825c623
  1. 2
      src/control/Control.cpp
  2. 2
      src/control/PageBackgroundChangeController.cpp
  3. 2
      src/control/pagetype/PageTypeMenu.cpp
  4. 2
      src/control/pagetype/PageTypeMenu.h
  5. 2
      src/gui/dialog/PageTemplateDialog.cpp

@ -98,7 +98,7 @@ Control::Control(GladeSearchpath* gladeSearchPath)
this->settings->load(); this->settings->load();
this->pageTypes = new PageTypeHandler(gladeSearchPath); 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->sidebar = NULL;
this->searchBar = NULL; this->searchBar = NULL;

@ -13,7 +13,7 @@
PageBackgroundChangeController::PageBackgroundChangeController(Control* control) PageBackgroundChangeController::PageBackgroundChangeController(Control* control)
: control(control), : control(control),
currentPageType(new PageTypeMenu(control->getPageTypes(), false, control->getSettings())), currentPageType(new PageTypeMenu(control->getPageTypes(), control->getSettings(), false, true)),
ignoreEvent(false) ignoreEvent(false)
{ {
XOJ_INIT_TYPE(PageBackgroundChangeController); XOJ_INIT_TYPE(PageBackgroundChangeController);

@ -14,7 +14,7 @@ PageTypeMenuChangeListener::~PageTypeMenuChangeListener() {}
#define PREVIEW_COLUMNS 3 #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), : showSpecial(showSpecial),
menu(gtk_menu_new()), menu(gtk_menu_new()),
types(types), types(types),

@ -41,7 +41,7 @@ public:
class PageTypeMenu class PageTypeMenu
{ {
public: public:
PageTypeMenu(PageTypeHandler* types, bool showPreview, Settings* settings, bool showSpecial = true); PageTypeMenu(PageTypeHandler* types, Settings* settings, bool showPreview, bool showSpecial);
virtual ~PageTypeMenu(); virtual ~PageTypeMenu();
public: public:

@ -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) PageTemplateDialog::PageTemplateDialog(GladeSearchpath* gladeSearchPath, Settings* settings, PageTypeHandler* types)
: GladeGui(gladeSearchPath, "pageTemplate.glade", "templateDialog"), : GladeGui(gladeSearchPath, "pageTemplate.glade", "templateDialog"),
settings(settings), settings(settings),
pageMenu(new PageTypeMenu(types, settings, false)), pageMenu(new PageTypeMenu(types, settings, false, false)),
saved(false) saved(false)
{ {
XOJ_INIT_TYPE(PageTemplateDialog); XOJ_INIT_TYPE(PageTemplateDialog);

Loading…
Cancel
Save