new OBScreen class is somewhat complete now i think

diff --git a/src/Makefile.am b/src/Makefile.am
index ef61e4c720b2142455aa62d9d90da33ea5df3526..a998e93d913e65c12debc8cb5bc1e4509379cc9e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ bin_PROGRAMS= openbox3
 
 openbox3_LDADD=../otk/libotk.a @LIBINTL@
 
-openbox3_SOURCES= client.cc frame.cc bbscreen.cc openbox.cc \
+openbox3_SOURCES= client.cc frame.cc bbscreen.cc openbox.cc screen.cc \
                  bbwindow.cc workspace.cc blackbox.cc \
                  main.cc xeventhandler.cc
 

diff --git a/src/openbox.hh b/src/openbox.hh
index c3fa3cf9c305a942f8b730d4299d9dfcfd469c3c..ccf2b80aa18634c163048812622e3d824c52ff03 100644 (file)
--- a/src/openbox.hh
+++ b/src/openbox.hh
@@ -142,7 +142,7 @@ public:
   inline const otk::OBProperty *property() const { return _property; }
 
   //! Returns the mouse cursors used throughout Openbox
-  inline const Cursors &cursor() const { return _cursors; }
+  inline const Cursors &cursors() const { return _cursors; }
 
   //! The main function of the Openbox class
   /*!