aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/BaseDisplay.cc4
-rw-r--r--src/BaseDisplay.hh4
-rw-r--r--src/Screen.hh4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc
index df07e2e..1006ed5 100644
--- a/src/BaseDisplay.cc
+++ b/src/BaseDisplay.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: BaseDisplay.cc,v 1.13 2002/04/08 22:23:41 fluxgen Exp $ 25// $Id: BaseDisplay.cc,v 1.14 2002/05/17 11:55:41 fluxgen Exp $
26 26
27// use GNU extensions 27// use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -322,7 +322,7 @@ void BaseDisplay::eventLoop(void) {
322} 322}
323 323
324 324
325const bool BaseDisplay::validateWindow(Window window) { 325bool BaseDisplay::validateWindow(Window window) {
326 XEvent event; 326 XEvent event;
327 if (XCheckTypedWindowEvent(m_display, window, DestroyNotify, &event)) { 327 if (XCheckTypedWindowEvent(m_display, window, DestroyNotify, &event)) {
328 XPutBackEvent(m_display, &event); 328 XPutBackEvent(m_display, &event);
diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh
index aef2ee3..173749c 100644
--- a/src/BaseDisplay.hh
+++ b/src/BaseDisplay.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: BaseDisplay.hh,v 1.20 2002/05/17 10:51:48 fluxgen Exp $ 25// $Id: BaseDisplay.hh,v 1.21 2002/05/17 11:55:31 fluxgen Exp $
26 26
27#ifndef BASEDISPLAY_HH 27#ifndef BASEDISPLAY_HH
28#define BASEDISPLAY_HH 28#define BASEDISPLAY_HH
@@ -99,7 +99,7 @@ public:
99 inline void shutdown(void) { m_shutdown = true; } 99 inline void shutdown(void) { m_shutdown = true; }
100 inline void run(void) { m_startup = m_shutdown = false; } 100 inline void run(void) { m_startup = m_shutdown = false; }
101 101
102 const bool validateWindow(Window); 102 bool validateWindow(Window);
103 103
104 void grab(void); 104 void grab(void);
105 void ungrab(void); 105 void ungrab(void);
diff --git a/src/Screen.hh b/src/Screen.hh
index a402c87..8ae34fe 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.hh,v 1.34 2002/05/17 11:02:30 fluxgen Exp $ 25// $Id: Screen.hh,v 1.35 2002/05/17 11:55:02 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -131,7 +131,7 @@ public:
131 inline Icons &getIconList(void) { return iconList; } 131 inline Icons &getIconList(void) { return iconList; }
132 132
133 inline int getNumberOfWorkspaces(void) { return *resource.workspaces; } 133 inline int getNumberOfWorkspaces(void) { return *resource.workspaces; }
134 inline const Toolbar::Placement getToolbarPlacement(void) { return *resource.toolbar_placement; } 134 inline Toolbar::Placement getToolbarPlacement(void) { return *resource.toolbar_placement; }
135#ifdef XINERAMA 135#ifdef XINERAMA
136 inline int getToolbarOnHead(void) { return *resource.toolbar_on_head; } 136 inline int getToolbarOnHead(void) { return *resource.toolbar_on_head; }
137#endif // XINERAMA 137#endif // XINERAMA