aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.hh')
-rw-r--r--src/fluxbox.hh6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index d930ad1..e7c7556 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -149,7 +149,7 @@ public:
149 void removeGroupSearch(Window win); 149 void removeGroupSearch(Window win);
150 void restart(const char *command = 0); 150 void restart(const char *command = 0);
151 void reconfigure(); 151 void reconfigure();
152 void rereadMenu(bool show_after_reread = false); 152 void rereadMenu();
153 /// reloads the menus if the timestamps changed 153 /// reloads the menus if the timestamps changed
154 154
155 /// handle any system signal sent to the application 155 /// handle any system signal sent to the application
@@ -201,7 +201,6 @@ private:
201 std::string getRcFilename(); 201 std::string getRcFilename();
202 void load_rc(); 202 void load_rc();
203 203
204 void real_rereadMenu();
205 void real_reconfigure(); 204 void real_reconfigure();
206 205
207 void handleEvent(XEvent *xe); 206 void handleEvent(XEvent *xe);
@@ -251,7 +250,7 @@ private:
251 250
252 Atom m_fluxbox_pid; 251 Atom m_fluxbox_pid;
253 252
254 bool m_reconfigure_wait, m_reread_menu_wait; 253 bool m_reconfigure_wait;
255 Time m_last_time; 254 Time m_last_time;
256 Window m_masked; 255 Window m_masked;
257 std::string m_rc_file; ///< resource filename 256 std::string m_rc_file; ///< resource filename
@@ -279,7 +278,6 @@ private:
279 bool m_starting; 278 bool m_starting;
280 bool m_restarting; 279 bool m_restarting;
281 bool m_shutdown; 280 bool m_shutdown;
282 bool m_show_menu_after_reread;
283 int m_server_grabs; 281 int m_server_grabs;
284 int m_randr_event_type; ///< the type number of randr event 282 int m_randr_event_type; ///< the type number of randr event
285 int m_shape_eventbase; ///< event base for shape events 283 int m_shape_eventbase; ///< event base for shape events