aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authormathias <mathias>2004-12-13 14:03:17 (GMT)
committermathias <mathias>2004-12-13 14:03:17 (GMT)
commiteb42a7806d0af854cc4bdfa8f194a0bb67446153 (patch)
tree5a8a22b0705ee927a16265f1a754159835fb22d9 /src/FbTk
parent7c7dfbfbddc635faaabb87fa755925fbb66d89dd (diff)
downloadfluxbox_paul-eb42a7806d0af854cc4bdfa8f194a0bb67446153.zip
fluxbox_paul-eb42a7806d0af854cc4bdfa8f194a0bb67446153.tar.bz2
icc complaint about a "possible" conflict between the
FbTk::Menu::update(Subject*) and FbTk::Menu::update(int index) to avoid this, we rename FbTk::Menu::update(int index) -> FbTk::Menu::updateMenu(int index) this is mostly cosmetic, but if it makes the life of a compiler happy, well .. be happy icc :)
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/Menu.cc12
-rw-r--r--src/FbTk/Menu.hh2
-rw-r--r--src/FbTk/Theme.hh3
3 files changed, 10 insertions, 7 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 2460951..7cf076b 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -398,13 +398,13 @@ void Menu::enableTitle() {
398 setTitleVisibility(true); 398 setTitleVisibility(true);
399} 399}
400 400
401void Menu::update(int active_index) { 401void Menu::updateMenu(int active_index) {
402 if (title_vis) { 402 if (title_vis) {
403 menu.item_w = theme().titleFont().textWidth(menu.label.c_str(), 403 menu.item_w = theme().titleFont().textWidth(menu.label.c_str(),
404 menu.label.size()); 404 menu.label.size());
405 405
406 menu.item_w += (theme().bevelWidth() * 2); 406 menu.item_w += (theme().bevelWidth() * 2);
407 } else 407 } else
408 menu.item_w = 1; 408 menu.item_w = 1;
409 409
410 unsigned int ii = 0; 410 unsigned int ii = 0;
@@ -626,7 +626,7 @@ void Menu::update(int active_index) {
626void Menu::show() { 626void Menu::show() {
627 627
628 if (m_need_update) 628 if (m_need_update)
629 update(); 629 updateMenu();
630 630
631 menu.window.showSubwindows(); 631 menu.window.showSubwindows();
632 menu.window.show(); 632 menu.window.show();
@@ -677,7 +677,7 @@ void Menu::clearWindow() {
677 if (alpha() < 255) { 677 if (alpha() < 255) {
678 renderTransp(0, 0, 678 renderTransp(0, 0,
679 menu.frame.width(), menu.frame.height()); 679 menu.frame.width(), menu.frame.height());
680 update(); 680 updateMenu();
681 } 681 }
682 682
683 menu.title.clear(); 683 menu.title.clear();
@@ -1368,7 +1368,7 @@ void Menu::keyPressEvent(XKeyEvent &event) {
1368 menuitems[which_press]->click(1, event.time); 1368 menuitems[which_press]->click(1, event.time);
1369 itemSelected(1, which_press); 1369 itemSelected(1, which_press);
1370 m_need_update = true; 1370 m_need_update = true;
1371 update(); 1371 updateMenu();
1372 } 1372 }
1373 break; 1373 break;
1374 default: 1374 default:
@@ -1413,7 +1413,7 @@ void Menu::reconfigure() {
1413 menu.title.setBorderWidth(theme().borderWidth()); 1413 menu.title.setBorderWidth(theme().borderWidth());
1414 1414
1415 1415
1416 update(); 1416 updateMenu();
1417 1417
1418} 1418}
1419 1419
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 04b440c..423b80a 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -117,7 +117,7 @@ public:
117 void setLabel(const char *labelstr); 117 void setLabel(const char *labelstr);
118 /// move menu to x,y 118 /// move menu to x,y
119 void move(int x, int y); 119 void move(int x, int y);
120 virtual void update(int active_index = -1); 120 virtual void updateMenu(int active_index = -1);
121 void setItemSelected(unsigned int index, bool val); 121 void setItemSelected(unsigned int index, bool val);
122 void setItemEnabled(unsigned int index, bool val); 122 void setItemEnabled(unsigned int index, bool val);
123 inline void setMinimumSublevels(int m) { menu.minsub = m; } 123 inline void setMinimumSublevels(int m) { menu.minsub = m; }
diff --git a/src/FbTk/Theme.hh b/src/FbTk/Theme.hh
index 7b83122..338c24b 100644
--- a/src/FbTk/Theme.hh
+++ b/src/FbTk/Theme.hh
@@ -135,6 +135,9 @@ public:
135 135
136 bool verbose() const { return m_verbose; } 136 bool verbose() const { return m_verbose; }
137 void setVerbose(bool value) { m_verbose = value; } 137 void setVerbose(bool value) { m_verbose = value; }
138
139 // dump theme out to filename, stdout if no filename is given
140 void dump(Theme& theme, const char* filename = 0) const;
138 // void listItems(); 141 // void listItems();
139private: 142private:
140 ThemeManager(); 143 ThemeManager();