diff options
Diffstat (limited to 'src/Screen.hh')
-rw-r--r-- | src/Screen.hh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index 9d436a9..e7b439c 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -88,8 +88,8 @@ public: | |||
88 | typedef std::vector<std::string> WorkspaceNames; | 88 | typedef std::vector<std::string> WorkspaceNames; |
89 | typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > ExtraMenus; | 89 | typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > ExtraMenus; |
90 | 90 | ||
91 | BScreen(FbTk::ResourceManager &rm, | 91 | BScreen(FbTk::ResourceManager_base &rm, |
92 | const std::string &screenname, const std::string &altscreenname, | 92 | const std::string &screenname, |
93 | int scrn, int number_of_layers); | 93 | int scrn, int number_of_layers); |
94 | ~BScreen(); | 94 | ~BScreen(); |
95 | 95 | ||
@@ -283,10 +283,9 @@ public: | |||
283 | 283 | ||
284 | FbTk::MultLayers &layerManager() { return m_layermanager; } | 284 | FbTk::MultLayers &layerManager() { return m_layermanager; } |
285 | const FbTk::MultLayers &layerManager() const { return m_layermanager; } | 285 | const FbTk::MultLayers &layerManager() const { return m_layermanager; } |
286 | FbTk::ResourceManager &resourceManager() { return m_resource_manager; } | 286 | FbTk::ResourceManager_base &resourceManager() { return m_resource_manager; } |
287 | const FbTk::ResourceManager &resourceManager() const { return m_resource_manager; } | 287 | const FbTk::ResourceManager_base &resourceManager() const { return m_resource_manager; } |
288 | const std::string &name() const { return m_name; } | 288 | const std::string &name() const { return m_name; } |
289 | const std::string &altName() const { return m_altname; } | ||
290 | bool isShuttingdown() const { return m_shutdown; } | 289 | bool isShuttingdown() const { return m_shutdown; } |
291 | bool isRestart(); | 290 | bool isRestart(); |
292 | 291 | ||
@@ -510,8 +509,7 @@ private: | |||
510 | FbTk::FbWindow m_dummy_window; | 509 | FbTk::FbWindow m_dummy_window; |
511 | 510 | ||
512 | struct ScreenResource { | 511 | struct ScreenResource { |
513 | ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname, | 512 | ScreenResource(FbTk::ResourceManager_base &rm, const std::string &scrname); |
514 | const std::string &altscrname); | ||
515 | 513 | ||
516 | FbTk::BoolResource opaque_move, full_max, | 514 | FbTk::BoolResource opaque_move, full_max, |
517 | max_ignore_inc, max_disable_move, max_disable_resize, | 515 | max_ignore_inc, max_disable_move, max_disable_resize, |
@@ -535,8 +533,8 @@ private: | |||
535 | /// Holds manage resources that screen destroys | 533 | /// Holds manage resources that screen destroys |
536 | FbTk::ResourceManager::ResourceList m_managed_resources; | 534 | FbTk::ResourceManager::ResourceList m_managed_resources; |
537 | 535 | ||
538 | FbTk::ResourceManager &m_resource_manager; | 536 | FbTk::ResourceManager_base &m_resource_manager; |
539 | const std::string m_name, m_altname; | 537 | const std::string m_name; |
540 | 538 | ||
541 | FocusControl *m_focus_control; | 539 | FocusControl *m_focus_control; |
542 | ScreenPlacement *m_placement_strategy; | 540 | ScreenPlacement *m_placement_strategy; |