summaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index b64664c..0001ed0 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.18 2002/02/17 18:54:58 fluxgen Exp $ 25// $Id: Screen.hh,v 1.19 2002/02/20 22:41:13 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -165,15 +165,15 @@ public:
165 inline Iconmenu *getIconmenu(void) { return iconmenu; } 165 inline Iconmenu *getIconmenu(void) { return iconmenu; }
166 166
167 167
168#ifdef HAVE_STRFTIME 168 #ifdef HAVE_STRFTIME
169 inline char *getStrftimeFormat(void) { return resource.strftime_format; } 169 inline char *getStrftimeFormat(void) { return resource.strftime_format; }
170 void saveStrftimeFormat(char *); 170 void saveStrftimeFormat(char *);
171#else // !HAVE_STRFTIME 171 #else // !HAVE_STRFTIME
172 inline int getDateFormat(void) { return resource.date_format; } 172 inline int getDateFormat(void) { return resource.date_format; }
173 inline void saveDateFormat(int f) { resource.date_format = f; } 173 inline void saveDateFormat(int f) { resource.date_format = f; }
174 inline Bool isClock24Hour(void) { return resource.clock24hour; } 174 inline Bool isClock24Hour(void) { return resource.clock24hour; }
175 inline void saveClock24Hour(Bool c) { resource.clock24hour = c; } 175 inline void saveClock24Hour(Bool c) { resource.clock24hour = c; }
176#endif // HAVE_STRFTIME 176 #endif // HAVE_STRFTIME
177 177
178 inline Theme::WindowStyle *getWindowStyle(void) { return &theme->getWindowStyle(); } 178 inline Theme::WindowStyle *getWindowStyle(void) { return &theme->getWindowStyle(); }
179 inline Theme::MenuStyle *getMenuStyle(void) { return &theme->getMenuStyle(); } 179 inline Theme::MenuStyle *getMenuStyle(void) { return &theme->getMenuStyle(); }
@@ -231,6 +231,7 @@ public:
231private: 231private:
232 #ifdef GNOME 232 #ifdef GNOME
233 void initGnomeAtoms(); 233 void initGnomeAtoms();
234 void updateGnomeClientList();
234 Window gnome_win; 235 Window gnome_win;
235 #endif 236 #endif
236 Theme *theme; 237 Theme *theme;
@@ -291,19 +292,18 @@ private:
291 Resource<Toolbar::Placement> toolbar_placement; 292 Resource<Toolbar::Placement> toolbar_placement;
292 293
293 294
294#ifdef SLIT 295 #ifdef SLIT
295 Bool slit_on_top, slit_auto_hide; 296 Bool slit_on_top, slit_auto_hide;
296 int slit_placement, slit_direction; 297 int slit_placement, slit_direction;
297#endif // SLIT 298 #endif // SLIT
298 299
299 300
300#ifdef HAVE_STRFTIME 301 #ifdef HAVE_STRFTIME
301 char *strftime_format; 302 char *strftime_format;
302#else // !HAVE_STRFTIME 303 #else // !HAVE_STRFTIME
303 Bool clock24hour; 304 Bool clock24hour;
304 int date_format; 305 int date_format;
305#endif // HAVE_STRFTIME 306 #endif // HAVE_STRFTIME
306
307 307
308 } resource; 308 } resource;
309 309