diff options
| author | Littleboy | 2011-04-29 12:15:49 -0400 |
|---|---|---|
| committer | Julien | 2011-06-16 14:23:28 -0400 |
| commit | 96148345483dd0e7667f0b7541d5956524181dd5 (patch) | |
| tree | dca875348202dacb8b3a28a5efa1e0b500f3092a /common | |
| parent | 79fb0ff223588fd7020ef8f133e74f2fdb35f95e (diff) | |
| download | scummvm-rg350-96148345483dd0e7667f0b7541d5956524181dd5.tar.gz scummvm-rg350-96148345483dd0e7667f0b7541d5956524181dd5.tar.bz2 scummvm-rg350-96148345483dd0e7667f0b7541d5956524181dd5.zip | |
BACKENDS/COMMON/GUI: Remove complete support for TaskbarManager when taskbar integration is not enabled
Diffstat (limited to 'common')
| -rw-r--r-- | common/system.h | 6 | ||||
| -rw-r--r-- | common/taskbar.h | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/common/system.h b/common/system.h index f556fa22f8..0bfa980800 100644 --- a/common/system.h +++ b/common/system.h @@ -42,7 +42,9 @@ struct Rect; class SaveFileManager; class SearchSet; class String; -class TaskbarManager; +#if defined(USE_TASKBAR) + class TaskbarManager; +#endif class TimerManager; class SeekableReadStream; class WriteStream; @@ -1048,6 +1050,7 @@ public: return _savefileManager; } +#if defined(USE_TASKBAR) /** * Returns the TaskbarManager, used to handle progress bars, * icon overlay, tasks and recent items list on the taskbar. @@ -1055,6 +1058,7 @@ public: * @return the TaskbarManager for the current architecture */ virtual Common::TaskbarManager *getTaskbarManager() = 0; +#endif /** * Returns the FilesystemFactory object, depending on the current architecture. diff --git a/common/taskbar.h b/common/taskbar.h index ff9fd9c264..023227e5e0 100644 --- a/common/taskbar.h +++ b/common/taskbar.h @@ -25,8 +25,11 @@ #ifndef COMMON_TASKBAR_MANAGER_H #define COMMON_TASKBAR_MANAGER_H +#include "common/scummsys.h" #include "common/str.h" +#if defined(USE_TASKBAR) + namespace Common { /** @@ -125,4 +128,6 @@ public: } // End of namespace Common +#endif + #endif // COMMON_TASKBAR_MANAGER_H |