aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
authormarkt <markt>2007-10-13 21:51:37 (GMT)
committermarkt <markt>2007-10-13 21:51:37 (GMT)
commita59428d67a95a9df16554962f0a6257d6378328a (patch)
treef856ed9300c34f7a17d499f22d895610cfbc08e5 /src/fluxbox.hh
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 0418901..625a906 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -196,7 +196,7 @@ public:
196 bool menuTimestampsChanged() const; 196 bool menuTimestampsChanged() const;
197 bool haveShape() const { return m_have_shape; } 197 bool haveShape() const { return m_have_shape; }
198 int shapeEventbase() const { return m_shape_eventbase; } 198 int shapeEventbase() const { return m_shape_eventbase; }
199 void getDefaultDataFilename(const char *name, std::string &); 199 void getDefaultDataFilename(const char *name, std::string &) const;
200 // screen mouse was in at last key event 200 // screen mouse was in at last key event
201 BScreen *mouseScreen() { return m_mousescreen; } 201 BScreen *mouseScreen() { return m_mousescreen; }
202 // screen of window that last key event (i.e. focused window) went to 202 // screen of window that last key event (i.e. focused window) went to
@@ -240,7 +240,7 @@ private:
240 FbTk::Resource<std::string> m_rc_stylefile, 240 FbTk::Resource<std::string> m_rc_stylefile,
241 m_rc_styleoverlayfile, 241 m_rc_styleoverlayfile,
242 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile, 242 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,
243 m_rc_groupfile, m_rc_appsfile; 243 m_rc_appsfile;
244 244
245 245
246 FbTk::Resource<TabsAttachArea> m_rc_tabs_attach_area; 246 FbTk::Resource<TabsAttachArea> m_rc_tabs_attach_area;