rm the xftlsfonts manpage

[chaz/openbox] / otk / property.hh

diff --git a/otk/property.hh b/otk/property.hh
index 215f941f47b8d7021713e3f6003869a1665658f0..b016cd04b70aba6be3be29272e3639bf6d02dc9e 100644 (file)
--- a/otk/property.hh
+++ b/otk/property.hh
@@ -33,9 +33,7 @@ public:
     Atom_String,   //!< The atom which represents ascii strings
     Atom_Utf8,     //!< The atom which represents utf8-encoded strings
     
-#ifdef    HAVE_GETPID
-    blackbox_pid,
-#endif // HAVE_GETPID
+    openbox_pid,
 
     // window hints
     wm_colormap_windows,
@@ -129,6 +127,7 @@ public:
     net_wm_action_close,
 
     net_wm_state_modal,
+    net_wm_state_sticky,
     net_wm_state_maximized_vert,
     net_wm_state_maximized_horz,
     net_wm_state_shaded,
@@ -136,6 +135,8 @@ public:
     net_wm_state_skip_pager,
     net_wm_state_hidden,
     net_wm_state_fullscreen,
+    net_wm_state_above,
+    net_wm_state_below,
 
     kde_net_system_tray_windows,
     kde_net_wm_system_tray_window_for,
@@ -159,7 +160,7 @@ public:
 private:
   //! The value of all atoms on the X server that exist in the
   //! OBProperty::Atoms enum
-  Atom                  _atoms[NUM_ATOMS];
+  Atom _atoms[NUM_ATOMS];
 
   //! Gets the value of an Atom from the X server, creating it if nessesary
   Atom create(const char *name) const;
@@ -317,7 +318,7 @@ public:
              value to return
     @return The value of the specified Atom
   */
-  inline Atom atom(Atoms a) {
+  inline Atom atom(Atoms a) const {
     assert(a >= 0 && a < NUM_ATOMS); Atom ret = _atoms[a]; assert(ret != 0);
     return ret;
   }