X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fproperty.hh;h=2bab9565b9c3ff962cd033c83d1cc12d9b42d145;hb=2fb944068494f9b6ef97c28aac0c0d814d9bd607;hp=912d8286c04a299c32087369b514e19ca4f78c96;hpb=68016ac352db39d538f725234a98df7caaa19cc0;p=chaz%2Fopenbox

diff --git a/otk/property.hh b/otk/property.hh
index 912d8286..2bab9565 100644
--- a/otk/property.hh
+++ b/otk/property.hh
@@ -34,7 +34,7 @@ public:
     Atom_Utf8,     //!< The atom which represents utf8-encoded strings
     
 #ifdef    HAVE_GETPID
-    blackbox_pid,
+    openbox_pid,
 #endif // HAVE_GETPID
 
     // window hints
@@ -136,20 +136,25 @@ public:
     net_wm_state_skip_pager,
     net_wm_state_hidden,
     net_wm_state_fullscreen,
+    net_wm_state_floating,
 
     kde_net_system_tray_windows,
     kde_net_wm_system_tray_window_for,
     kde_net_wm_window_type_override,
  
+#ifndef DOXYGEN_IGNORE
     // constant for how many atoms exist in the enumerator
     NUM_ATOMS
+#endif
   };
 
   //! The possible types/encodings of strings
   enum StringType {
     ascii, //!< Standard 8-bit ascii string
     utf8,  //!< Utf8-encoded string
+#ifndef DOXYGEN_IGNORE
     NUM_STRING_TYPE
+#endif
   };
 
 private:
@@ -313,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;
   }