summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormathias <mathias>2006-01-16 18:46:39 (GMT)
committermathias <mathias>2006-01-16 18:46:39 (GMT)
commitf803d8f2502796993a838783eeaf81b17f2faca0 (patch)
tree782146499f4c588c66ca7eab4309f5902ecb6a9c /src
parentb7ddb0ca13278d7b5a3a45ef03fd394b9b387bf3 (diff)
downloadfluxbox_lack-f803d8f2502796993a838783eeaf81b17f2faca0.zip
fluxbox_lack-f803d8f2502796993a838783eeaf81b17f2faca0.tar.bz2
applied patch from php-coder to fix some warnings, mostly signed vs unsigned
issues
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/MenuTheme.hh4
-rw-r--r--src/MenuCreator.cc2
-rw-r--r--src/Screen.cc4
-rw-r--r--src/Window.cc8
4 files changed, 9 insertions, 9 deletions
diff --git a/src/FbTk/MenuTheme.hh b/src/FbTk/MenuTheme.hh
index 8fc4d1c..67e1ae1 100644
--- a/src/FbTk/MenuTheme.hh
+++ b/src/FbTk/MenuTheme.hh
@@ -150,8 +150,8 @@ private:
150 MenuMode m_menumode; 150 MenuMode m_menumode;
151 unsigned int m_delayopen; ///< in msec 151 unsigned int m_delayopen; ///< in msec
152 unsigned int m_delayclose; ///< in msec 152 unsigned int m_delayclose; ///< in msec
153 int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight) 153 unsigned int m_real_title_height; ///< the calculated item height (from font and menu.titleHeight)
154 int m_real_item_height; ///< the calculated item height (from font and menu.itemHeight) 154 unsigned int m_real_item_height; ///< the calculated item height (from font and menu.itemHeight)
155}; 155};
156 156
157} // end namespace FbTk 157} // end namespace FbTk
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index fc427aa..4ea83a8 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -472,7 +472,7 @@ FbTk::Menu *MenuCreator::createMenuType(const std::string &type, int screen_num)
472 "close", 472 "close",
473 0 473 0
474 }; 474 };
475 for (int i=0; i < sizeof(default_menu); ++i) 475 for (unsigned int i=0; i < sizeof(default_menu); ++i)
476 createWindowMenuItem(default_menu[i], "", *menu); 476 createWindowMenuItem(default_menu[i], "", *menu);
477 } 477 }
478 menu->reconfigure(); // update graphics 478 menu->reconfigure(); // update graphics
diff --git a/src/Screen.cc b/src/Screen.cc
index b18dcb8..17e087b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -714,7 +714,7 @@ void BScreen::reconfigure() {
714 renderPosWindow(); 714 renderPosWindow();
715 715
716 // realize the number of workspaces from the init-file 716 // realize the number of workspaces from the init-file
717 const int nr_ws = *resource.workspaces; 717 const unsigned int nr_ws = *resource.workspaces;
718 if (nr_ws > m_workspaces_list.size()) { 718 if (nr_ws > m_workspaces_list.size()) {
719 while(nr_ws != m_workspaces_list.size()) { 719 while(nr_ws != m_workspaces_list.size()) {
720 addWorkspace(); 720 addWorkspace();
@@ -760,7 +760,7 @@ void BScreen::reconfigure() {
760 if (restore_menus) { 760 if (restore_menus) {
761 // restore submenus, no timestamp changed 761 // restore submenus, no timestamp changed
762 FbTk::Menu *menu = m_rootmenu.get(); 762 FbTk::Menu *menu = m_rootmenu.get();
763 for (int i = 0; i < (int)remember_sub.size(); i++ ) { 763 for (unsigned int i = 0; i < remember_sub.size(); i++ ) {
764 int sub = remember_sub[i]; 764 int sub = remember_sub[i];
765 if (!menu || sub < 0) 765 if (!menu || sub < 0)
766 break; 766 break;
diff --git a/src/Window.cc b/src/Window.cc
index 2eecc1e..fe97517 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2496,10 +2496,10 @@ void FluxboxWindow::propertyNotifyEvent(WinClient &client, Atom atom) {
2496#ifdef DEBUG 2496#ifdef DEBUG
2497 cerr<<"XA_WM_NORMAL_HINTS("<<title()<<")"<<endl; 2497 cerr<<"XA_WM_NORMAL_HINTS("<<title()<<")"<<endl;
2498#endif // DEBUG 2498#endif // DEBUG
2499 int old_max_width = client.max_width; 2499 unsigned int old_max_width = client.max_width;
2500 int old_min_width = client.min_width; 2500 unsigned int old_min_width = client.min_width;
2501 int old_min_height = client.min_height; 2501 unsigned int old_min_height = client.min_height;
2502 int old_max_height = client.max_height; 2502 unsigned int old_max_height = client.max_height;
2503 bool changed = false; 2503 bool changed = false;
2504 client.updateWMNormalHints(); 2504 client.updateWMNormalHints();
2505 2505