rearranged accessors and fixed new timer command

1 files changed, 23 insertions, 24 deletions

diff --git a/src/Slit.hh b/src/Slit.hh
index 023d35d..9b844e2 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
         
-/// $Id: Slit.hh,v 1.36 2003/07/19 11:55:49 rathnor Exp $
+/// $Id: Slit.hh,v 1.37 2003/08/11 16:02:38 fluxgen Exp $
 
 #ifndef  SLIT_HH
 #define  SLIT_HH
@@ -47,7 +47,7 @@ class FbMenu;
 class Strut;
 
 /// Handles dock apps
-class Slit : public FbTk::TimeoutHandler, public FbTk::EventHandler {
+class Slit: public FbTk::EventHandler {
 public:
     
     /**
@@ -63,22 +63,6 @@ public:
     Slit(BScreen &screen, FbTk::XLayer &layer, const char *filename = 0);
     virtual ~Slit();
 
-    inline bool isHidden() const { return m_hidden; }
-    inline bool doAutoHide() const { return *m_rc_auto_hide; }
-    inline Direction direction() const { return *m_rc_direction; }
-    inline Placement placement() const { return *m_rc_placement; }
-    inline int getOnHead() const { return *m_rc_on_head; }
-    void saveOnHead(int head);
-    FbTk::Menu &menu() { return m_slitmenu; }
-
-    inline const FbTk::FbWindow &window() const { return frame.window; }
-
-    inline int x() const { return (m_hidden ? frame.x_hidden : frame.x); }
-    inline int y() const { return (m_hidden ? frame.y_hidden : frame.y); }
-
-    inline unsigned int width() const { return frame.width; }
-    inline unsigned int height() const { return frame.height; }
-
     void setDirection(Direction dir);
     void setPlacement(Placement place);
     void setAutoHide(bool val);
@@ -93,11 +77,6 @@ public:
     void cycleClientsUp();
     /// cycle slit clients down one step
     void cycleClientsDown();
-
-    BScreen &screen() { return m_screen; }
-    const BScreen &screen() const { return m_screen; }
-    SlitTheme &theme() { return *m_slit_theme.get(); }
-    const SlitTheme &theme() const { return *m_slit_theme.get(); }
     /**
        @name eventhandlers
     */
@@ -111,10 +90,30 @@ public:
     //@}
         
     void moveToLayer(int layernum);
+    void toggleHidden();
+
+    BScreen &screen() { return m_screen; }
+    const BScreen &screen() const { return m_screen; }
+    SlitTheme &theme() { return *m_slit_theme.get(); }
+    const SlitTheme &theme() const { return *m_slit_theme.get(); }
+
     FbTk::XLayerItem &layerItem() { return *m_layeritem; }
+    inline bool isHidden() const { return m_hidden; }
+    inline bool doAutoHide() const { return *m_rc_auto_hide; }
+    inline Direction direction() const { return *m_rc_direction; }
+    inline Placement placement() const { return *m_rc_placement; }
+    inline int getOnHead() const { return *m_rc_on_head; }
+    void saveOnHead(int head);
+    FbTk::Menu &menu() { return m_slitmenu; }
+
+    inline const FbTk::FbWindow &window() const { return frame.window; }
 
-    virtual void timeout();
+    inline int x() const { return (m_hidden ? frame.x_hidden : frame.x); }
+    inline int y() const { return (m_hidden ? frame.y_hidden : frame.y); }
 
+    inline unsigned int width() const { return frame.width; }
+    inline unsigned int height() const { return frame.height; }
+    
 private:
     void clearWindow();
     void setupMenu();