aboutsummaryrefslogtreecommitdiff
path: root/src/Container.cc
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.cc
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/Container.cc')
-rw-r--r--src/Container.cc18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/Container.cc b/src/Container.cc
index d6ffcf3..e2d01c7 100644
--- a/src/Container.cc
+++ b/src/Container.cc
@@ -36,7 +36,6 @@ Container::Container(const FbTk::FbWindow &parent):
36 m_align(RELATIVE), 36 m_align(RELATIVE),
37 m_max_size_per_client(60), 37 m_max_size_per_client(60),
38 m_max_total_size(0), 38 m_max_total_size(0),
39 m_selected(0),
40 m_update_lock(false) { 39 m_update_lock(false) {
41 FbTk::EventManager::instance()->add(*this, *this); 40 FbTk::EventManager::instance()->add(*this, *this);
42} 41}
@@ -215,9 +214,6 @@ bool Container::removeItem(int index) {
215 for (; index != 0; ++it, --index) 214 for (; index != 0; ++it, --index)
216 continue; 215 continue;
217 216
218 if (*it == selected())
219 m_selected = 0;
220
221 m_item_list.erase(it); 217 m_item_list.erase(it);
222 218
223 repositionItems(); 219 repositionItems();
@@ -225,7 +221,6 @@ bool Container::removeItem(int index) {
225} 221}
226 222
227void Container::removeAll() { 223void Container::removeAll() {
228 m_selected = 0;
229 m_item_list.clear(); 224 m_item_list.clear();
230 if (!m_update_lock) { 225 if (!m_update_lock) {
231 clear(); 226 clear();
@@ -248,19 +243,6 @@ int Container::find(ConstItem item) {
248 return index; 243 return index;
249} 244}
250 245
251void Container::setSelected(int pos) {
252 if (pos < 0 || pos >= size())
253 m_selected = 0;
254 else {
255 ItemList::iterator it = m_item_list.begin();
256 for (; pos != 0; --pos, ++it)
257 continue;
258 m_selected = *it;
259 // caller does any graphics stuff if appropriate
260 }
261
262}
263
264void Container::setMaxSizePerClient(unsigned int size) { 246void Container::setMaxSizePerClient(unsigned int size) {
265 if (size != m_max_size_per_client) { 247 if (size != m_max_size_per_client) {
266 m_max_size_per_client = size; 248 m_max_size_per_client = size;