aboutsummaryrefslogtreecommitdiff
path: root/src/Container.hh
diff options
context:
space:
mode:
authormarkt <markt>2007-10-13 21:51:37 (GMT)
committermarkt <markt>2007-10-13 21:51:37 (GMT)
commita59428d67a95a9df16554962f0a6257d6378328a (patch)
treef856ed9300c34f7a17d499f22d895610cfbc08e5 /src/Container.hh
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/Container.hh')
-rw-r--r--src/Container.hh4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/Container.hh b/src/Container.hh
index cfaf1ea..69da43d 100644
--- a/src/Container.hh
+++ b/src/Container.hh
@@ -65,7 +65,6 @@ public:
65 void moveItem(Item item, int movement); // wraps around 65 void moveItem(Item item, int movement); // wraps around
66 bool moveItemTo(Item item, int x, int y); 66 bool moveItemTo(Item item, int x, int y);
67 int find(ConstItem item); 67 int find(ConstItem item);
68 void setSelected(int index);
69 void setMaxSizePerClient(unsigned int size); 68 void setMaxSizePerClient(unsigned int size);
70 void setMaxTotalSize(unsigned int size); 69 void setMaxTotalSize(unsigned int size);
71 void setAlignment(Alignment a); 70 void setAlignment(Alignment a);
@@ -93,8 +92,6 @@ public:
93 inline FbTk::Orientation orientation() const { return m_orientation; } 92 inline FbTk::Orientation orientation() const { return m_orientation; }
94 inline int size() const { return m_item_list.size(); } 93 inline int size() const { return m_item_list.size(); }
95 inline bool empty() const { return m_item_list.empty(); } 94 inline bool empty() const { return m_item_list.empty(); }
96 inline const Item& selected() const { return m_selected; }
97 inline Item selected() { return m_selected; }
98 unsigned int maxWidthPerClient() const; 95 unsigned int maxWidthPerClient() const;
99 inline bool updateLock() const { return m_update_lock; } 96 inline bool updateLock() const { return m_update_lock; }
100 97
@@ -115,7 +112,6 @@ private:
115 unsigned int m_max_size_per_client; 112 unsigned int m_max_size_per_client;
116 unsigned int m_max_total_size; 113 unsigned int m_max_total_size;
117 ItemList m_item_list; 114 ItemList m_item_list;
118 Item m_selected;
119 bool m_update_lock; 115 bool m_update_lock;
120}; 116};
121 117