From 6ea2e4e38f65275808ce14bf16d7eb4a23cd038f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 25 Jan 2008 02:00:58 +0000 Subject: [PATCH] Move flags around, fixes the build. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23728 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- 3rdparty/mmu_man/themes/ThemeManager.h | 14 ++------------ 3rdparty/mmu_man/themes/UITheme.h | 13 +++++++++++++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/3rdparty/mmu_man/themes/ThemeManager.h b/3rdparty/mmu_man/themes/ThemeManager.h index c6612dc43a..4a5f769116 100644 --- a/3rdparty/mmu_man/themes/ThemeManager.h +++ b/3rdparty/mmu_man/themes/ThemeManager.h @@ -6,21 +6,11 @@ #include #include +#include "UITheme.h" + /* backup of current settings when applying a theme */ #define THEME_ID_BACKUP -1 -/* flags */ - - // try to apply settings to running applications -#define UI_THEME_SETTINGS_APPLY 0x00000001 - // save settings to native storage -#define UI_THEME_SETTINGS_SAVE 0x00000002 - // attempt to do both -#define UI_THEME_SETTINGS_SET_ALL (UI_THEME_SETTINGS_APPLY|UI_THEME_SETTINGS_SAVE) - // do read settings from native storage -#define UI_THEME_SETTINGS_RETRIEVE 0x00000004 - - namespace Z { namespace ThemeManager { class ThemeManager; diff --git a/3rdparty/mmu_man/themes/UITheme.h b/3rdparty/mmu_man/themes/UITheme.h index 6f64db05c0..fd6b741014 100644 --- a/3rdparty/mmu_man/themes/UITheme.h +++ b/3rdparty/mmu_man/themes/UITheme.h @@ -37,6 +37,19 @@ // allow this addon to save things to themes #define Z_THEME_ADDON_DO_RETRIEVE 0x00000004 +// Theme Manager flags + // try to apply settings to running applications +#define UI_THEME_SETTINGS_APPLY 0x00000001 + // save settings to native storage +#define UI_THEME_SETTINGS_SAVE 0x00000002 + // attempt to do both +#define UI_THEME_SETTINGS_SET_ALL (UI_THEME_SETTINGS_APPLY|UI_THEME_SETTINGS_SAVE) + // do read settings from native storage +#define UI_THEME_SETTINGS_RETRIEVE 0x00000004 + + + + #define Z_THEMES_FOLDER_NAME "UIThemes" #define Z_THEME_FILE_NAME "Theme"