diff options
Diffstat (limited to 'src/Fl_Menu_.cxx')
| -rw-r--r-- | src/Fl_Menu_.cxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/Fl_Menu_.cxx b/src/Fl_Menu_.cxx index bce89ef39..9d857c11c 100644 --- a/src/Fl_Menu_.cxx +++ b/src/Fl_Menu_.cxx @@ -74,7 +74,8 @@ int Fl_Menu_::item_pathname_(char *name, int level = 0; finditem = finditem ? finditem : mvalue(); menu = menu ? menu : this->menu(); - for ( int t=0; t<size(); t++ ) { + int t; + for (t =0; t<size(); t++ ) { const Fl_Menu_Item *m = menu + t; if (m->submenu()) { // submenu? descend if (m->flags & FL_SUBMENU_POINTER) { @@ -196,7 +197,8 @@ int Fl_Menu_::find_index(const Fl_Menu_Item *item) const { \see find_index(const char*) */ int Fl_Menu_::find_index(Fl_Callback *cb) const { - for ( int t=0; t < size(); t++ ) + int t; + for (t =0; t < size(); t++ ) if (menu_[t].callback_==cb) return(t); return(-1); @@ -217,7 +219,8 @@ int Fl_Menu_::find_index(Fl_Callback *cb) const { */ int Fl_Menu_::find_index(const char *pathname) const { char menupath[1024] = ""; // File/Export - for ( int t=0; t < size(); t++ ) { + int t; + for (t =0; t < size(); t++ ) { Fl_Menu_Item *m = menu_ + t; if (m->flags&FL_SUBMENU) { // IT'S A SUBMENU @@ -257,7 +260,8 @@ int Fl_Menu_::find_index(const char *pathname) const { \see find_item(const char*) */ const Fl_Menu_Item * Fl_Menu_::find_item(Fl_Callback *cb) { - for ( int t=0; t < size(); t++ ) { + int t; + for (t =0; t < size(); t++ ) { const Fl_Menu_Item *m = menu_ + t; if (m->callback_==cb) { return m; @@ -274,7 +278,8 @@ const Fl_Menu_Item * Fl_Menu_::find_item(Fl_Callback *cb) { \see find_item(const char*) */ const Fl_Menu_Item* Fl_Menu_::find_item_with_user_data(void *v) { - for ( int t=0; t < size(); t++ ) { + int t; + for (t =0; t < size(); t++ ) { const Fl_Menu_Item *m = menu_ + t; if (m->user_data_==v) { return m; @@ -291,7 +296,8 @@ const Fl_Menu_Item* Fl_Menu_::find_item_with_user_data(void *v) { \see find_item(const char*) */ const Fl_Menu_Item* Fl_Menu_::find_item_with_argument(long v) { - for ( int t=0; t < size(); t++ ) { + int t; + for (t =0; t < size(); t++ ) { const Fl_Menu_Item *m = menu_ + t; if (m->argument()==v) { return m; @@ -582,7 +588,8 @@ void Fl_Menu_::clear() { // not to free() images or Fl_Multi_Label's because they can // either be static or are allocated by operator new. - for (int i = size(); i--;) { + int i; + for (i = size(); i--;) { if (!menu_[i].text) continue; switch(menu_[i].labeltype_) { |