aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-03-08 12:18:22 (GMT)
committerfluxgen <fluxgen>2002-03-08 12:18:22 (GMT)
commit4fc50aed36df57216939235a919731ba8ccd8941 (patch)
tree6348a49247c2b4f9a0f80597d2b5ae1ddaa95333
parent6d282002e55849d2799de4c11ea31460c77eb47c (diff)
downloadfluxbox-4fc50aed36df57216939235a919731ba8ccd8941.zip
fluxbox-4fc50aed36df57216939235a919731ba8ccd8941.tar.bz2
fixed bug in ::removeNetizen and changed name from InitMenu to initMenu
-rw-r--r--src/Screen.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 1c86baf..a3a938f 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.33 2002/02/28 15:46:01 fluxgen Exp $ 25// $Id: Screen.cc,v 1.34 2002/03/08 12:18:22 fluxgen Exp $
26 26
27// stupid macros needed to access some functions in version 2 of the GNU C 27// stupid macros needed to access some functions in version 2 of the GNU C
28// library 28// library
@@ -409,7 +409,7 @@ resource(rm, screenname, altscreenname)
409 slit = new Slit(this); 409 slit = new Slit(this);
410 #endif // SLIT 410 #endif // SLIT
411 411
412 InitMenu(); 412 initMenu();
413 413
414 raiseWindows(0, 0); 414 raiseWindows(0, 0);
415 rootmenu->update(); 415 rootmenu->update();
@@ -615,7 +615,7 @@ void BScreen::reconfigure(void) {
615 615
616 { 616 {
617 int remember_sub = rootmenu->getCurrentSubmenu(); 617 int remember_sub = rootmenu->getCurrentSubmenu();
618 InitMenu(); 618 initMenu();
619 raiseWindows(0, 0); 619 raiseWindows(0, 0);
620 rootmenu->reconfigure(); 620 rootmenu->reconfigure();
621 rootmenu->drawSubmenu(remember_sub); 621 rootmenu->drawSubmenu(remember_sub);
@@ -647,7 +647,7 @@ void BScreen::reconfigure(void) {
647 647
648 648
649void BScreen::rereadMenu(void) { 649void BScreen::rereadMenu(void) {
650 InitMenu(); 650 initMenu();
651 raiseWindows(0, 0); 651 raiseWindows(0, 0);
652 652
653 rootmenu->reconfigure(); 653 rootmenu->reconfigure();
@@ -877,8 +877,9 @@ void BScreen::removeNetizen(Window w) {
877 Netizens::iterator it_end = netizenList.end(); 877 Netizens::iterator it_end = netizenList.end();
878 for (; it != it_end; ++it) { 878 for (; it != it_end; ++it) {
879 if ((*it)->getWindowID() == w) { 879 if ((*it)->getWindowID() == w) {
880 Netizen *n = *netizenList.erase(it); 880 Netizen *n = *it;
881 delete n; 881 delete n;
882 netizenList.erase(it);
882 break; 883 break;
883 } 884 }
884 } 885 }
@@ -1192,7 +1193,7 @@ void BScreen::raiseFocus(void) {
1192 raiseWindow(fluxbox->getFocusedWindow()); 1193 raiseWindow(fluxbox->getFocusedWindow());
1193} 1194}
1194 1195
1195void BScreen::InitMenu(void) { 1196void BScreen::initMenu(void) {
1196 I18n *i18n = I18n::instance(); 1197 I18n *i18n = I18n::instance();
1197 1198
1198 if (rootmenu) { 1199 if (rootmenu) {
@@ -1294,7 +1295,7 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1294 1295
1295 if (getline(file, line)) { 1296 if (getline(file, line)) {
1296 row++; 1297 row++;
1297 if (line[0] != '#') { 1298 if (line[0] != '#') { //the line is commented
1298 int parse_pos = 0, err = 0; 1299 int parse_pos = 0, err = 0;
1299 1300
1300 1301