SF.net SVN: alleg:[14846] allegro/branches/5.1/addons/native_dialog/menu.c

[<kon...@us...>]

Revision: 14846
          http://alleg.svn.sourceforge.net/alleg/?rev=14846&view=rev
Author:   konforce
Date:     2011-07-15 04:31:32 +0000 (Fri, 15 Jul 2011)

Log Message:
-----------
native menus: rename 'popup' parameter to 'submenu' for clarification

Modified Paths:
--------------
    allegro/branches/5.1/addons/native_dialog/menu.c

Modified: allegro/branches/5.1/addons/native_dialog/menu.c
===================================================================
--- allegro/branches/5.1/addons/native_dialog/menu.c	2011-07-15 03:51:54 UTC (rev 14845)
+++ allegro/branches/5.1/addons/native_dialog/menu.c	2011-07-15 04:31:32 UTC (rev 14846)
@@ -337,19 +337,19 @@
 /* Function: al_append_menu_item
  */
 int al_append_menu_item(ALLEGRO_MENU *parent, char const *title, int id,
-   int flags, ALLEGRO_BITMAP *icon, ALLEGRO_MENU *popup)
+   int flags, ALLEGRO_BITMAP *icon, ALLEGRO_MENU *submenu)
 {
    ASSERT(parent);
 
    /* Same thing as inserting a menu item at position == -SIZE */
    return al_insert_menu_item(parent, 0 - (int) _al_vector_size(&parent->items),
-      title, id, flags, icon, popup);
+      title, id, flags, icon, submenu);
 }
 
 /* Function: al_insert_menu_item
  */
 int al_insert_menu_item(ALLEGRO_MENU *parent, int pos, char const *title,
-   int id, int flags, ALLEGRO_BITMAP *icon, ALLEGRO_MENU *popup)
+   int id, int flags, ALLEGRO_BITMAP *icon, ALLEGRO_MENU *submenu)
 {
    ALLEGRO_MENU_ITEM *item;
    ALLEGRO_MENU_ITEM **slot;
@@ -367,10 +367,10 @@
    /* At this point pos == the _index_ of where to insert */
 
    /* The sub-menu must not already be in use. */
-   if (popup && (popup->display || popup->parent || popup->is_popup_menu))
+   if (submenu && (submenu->display || submenu->parent || submenu->is_popup_menu))
       return -1;
 
-   item = create_menu_item(title, id, flags, popup);
+   item = create_menu_item(title, id, flags, submenu);
    if (!item)
       return -1;
    item->parent = parent;
@@ -393,11 +393,11 @@
    }
    *slot = item;
 
-   if (popup) {
-      popup->parent = item;
+   if (submenu) {
+      submenu->parent = item;
 
       if (parent->display)
-         _al_walk_over_menu(popup, set_menu_display_r, parent->display);
+         _al_walk_over_menu(submenu, set_menu_display_r, parent->display);
    }
 
    _al_insert_menu_item_at(item, (int) i);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.