Merge branch 'feature/upstream' into develop

1 files changed, 259 insertions, 228 deletions

diff --git a/app/wlib/gtklib/menu.c b/app/wlib/gtklib/menu.c
index 754f88f..8646f15 100644
--- a/app/wlib/gtklib/menu.c
+++ b/app/wlib/gtklib/menu.c
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <stdio.h>
@@ -50,28 +50,29 @@
 typedef enum { M_MENU, M_SEPARATOR, M_PUSH, M_LIST, M_LISTITEM, M_TOGGLE, M_RADIO } mtype_e;
 typedef enum { MM_BUTT, MM_MENU, MM_BAR, MM_POPUP } mmtype_e;
 
-typedef struct{	mtype_e mtype;			/**< menu entry type */
-				GtkWidget *menu_item;
-				wMenu_p parentMenu;
-				int recursion; 			/**< recursion counter */
-		} MOBJ_COMMON; 					/**< menu item specific data */
-							
-	
+typedef struct {
+	mtype_e mtype;			/**< menu entry type */
+	GtkWidget *menu_item;
+	wMenu_p parentMenu;
+	int recursion; 			/**< recursion counter */
+} MOBJ_COMMON; 					/**< menu item specific data */
+
+
 struct wMenuItem_t {
 	WOBJ_COMMON
 	MOBJ_COMMON m;
-	};
+};
 
 typedef struct wMenuItem_t * wMenuItem_p;
 
-// a few macros to make access to members easier	
-//#define PTR2M( ptr ) ((ptr)->m)	
-#define MMENUITEM( ptr ) 	(((ptr)->m).menu_item)	
+// a few macros to make access to members easier
+//#define PTR2M( ptr ) ((ptr)->m)
+#define MMENUITEM( ptr ) 	(((ptr)->m).menu_item)
 #define MPARENT( ptr ) 	(((ptr)->m).parentMenu)
 #define MITEMTYPE( ptr )	(((ptr)->m).mtype)
-#define MRECURSION( ptr ) (((ptr)->m).recursion)	
-	
-	
+#define MRECURSION( ptr ) (((ptr)->m).recursion)
+
+
 struct wMenu_t {
 	WOBJ_COMMON
 	MOBJ_COMMON m;
@@ -83,21 +84,21 @@ struct wMenu_t {
 	void * traceData;
 	GtkLabel * labelG;
 	GtkWidget * imageG;
-	};
+};
 
 struct wMenuPush_t {
 	WOBJ_COMMON
 	MOBJ_COMMON m;
 	wMenuCallBack_p action;
 	wBool_t enabled;
-	};
+};
 
 struct wMenuRadio_t {
 	WOBJ_COMMON
 	MOBJ_COMMON m;
 	wMenuCallBack_p action;
 	wBool_t enabled;
-	};
+};
 
 struct wMenuList_t {
 	WOBJ_COMMON
@@ -105,44 +106,45 @@ struct wMenuList_t {
 	int max;
 	int count;
 	wMenuListCallBack_p action;
-	};
+};
 
 struct wMenuListItem_t {
 	WOBJ_COMMON
 	MOBJ_COMMON m;
 	wMenuList_p mlist;
-	};
+};
 
 typedef struct wMenuListItem_t * wMenuListItem_p;
-	
+
 struct wMenuToggle_t {
 	WOBJ_COMMON
 	MOBJ_COMMON m;
 	wMenuCallBack_p action;
 	wBool_t enabled;
 	wBool_t set;
-	};
+};
 
 
 /*-----------------------------------------------------------------*/
-	
+
 /**
  * Handle activate event for menu items.
  *
  * \param widget IN widget that emitted the signal
  * \param value  IN application data
- * \return 
+ * \return
  */
-	
+
 static void pushMenuItem(
-	GtkWidget * widget,
-	gpointer value )
+        GtkWidget * widget,
+        gpointer value )
 {
 	wMenuItem_p m = (wMenuItem_p)value;
 	wMenuToggle_p mt;
 
-	if (MRECURSION( m ))
+	if (MRECURSION( m )) {
 		return;
+	}
 
 	switch MITEMTYPE( m ) {
 	case M_PUSH:
@@ -155,9 +157,10 @@ static void pushMenuItem(
 		break;
 	case M_RADIO:
 		/* NOTE: action is only called when radio button is activated, not when deactivated */
-		if( gtk_check_menu_item_get_active((GtkCheckMenuItem *)widget ) == TRUE )
+		if( gtk_check_menu_item_get_active((GtkCheckMenuItem *)widget ) == TRUE ) {
 			((wMenuRadio_p)m)->action( ((wMenuRadio_p)m)->data );
-		break;	
+		}
+		break;
 	case M_MENU:
 		return;
 	default:
@@ -167,57 +170,63 @@ static void pushMenuItem(
 	if( MPARENT(m)->traceFunc ) {
 		MPARENT(m)->traceFunc( MPARENT( m ), m->labelStr,  MPARENT(m)->traceData );
 	}
-} 
+}
 
 /**
  * Create a new menu element, add to the parent menu and to help
  *
  * \param m 		IN parent menu
  * \param mtype 	IN type of new entry
- * \param helpStr 	IN help topic 
+ * \param helpStr 	IN help topic
  * \param labelStr 	IN display label
  * \param size 		IN size of additional data?
  * \return    the newly created menu element
  */
 
 static wMenuItem_p createMenuItem(
-	wMenu_p m,
-	mtype_e mtype,
-	const char * helpStr,
-	const char * labelStr,
-	int size )
+        wMenu_p m,
+        mtype_e mtype,
+        const char * helpStr,
+        const char * labelStr,
+        int size )
 {
 	wMenuItem_p mi;
 	mi = (wMenuItem_p)wlibAlloc( NULL, B_MENUITEM, 0, 0, labelStr, size, NULL );
 	MITEMTYPE( mi )= mtype;
-	
+
 	switch ( mtype ) {
 	case M_LIST:
-		MMENUITEM( mi ) = gtk_menu_item_new_with_mnemonic(wlibConvertInput(mi->labelStr)); // NULL;  //PTR2M(m).menu_item
+		MMENUITEM( mi ) = gtk_menu_item_new_with_mnemonic(wlibConvertInput(
+		                          mi->labelStr)); // NULL;  //PTR2M(m).menu_item
 		break;
 	case M_SEPARATOR:
 		MMENUITEM( mi ) = gtk_separator_menu_item_new();
 		break;
 	case M_TOGGLE:
-		MMENUITEM( mi ) = gtk_check_menu_item_new_with_mnemonic(wlibConvertInput(mi->labelStr));
+		MMENUITEM( mi ) = gtk_check_menu_item_new_with_mnemonic(wlibConvertInput(
+		                          mi->labelStr));
 		break;
 	case M_RADIO:
-		MMENUITEM( mi ) = gtk_radio_menu_item_new_with_mnemonic(m->radioGroup, wlibConvertInput(mi->labelStr));
-		m->radioGroup = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (MMENUITEM( mi )));
-		break;			
+		MMENUITEM( mi ) = gtk_radio_menu_item_new_with_mnemonic(m->radioGroup,
+		                  wlibConvertInput(mi->labelStr));
+		m->radioGroup = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (MMENUITEM(
+		                        mi )));
+		break;
 	default:
-		MMENUITEM( mi ) = gtk_menu_item_new_with_mnemonic(wlibConvertInput(mi->labelStr));
+		MMENUITEM( mi ) = gtk_menu_item_new_with_mnemonic(wlibConvertInput(
+		                          mi->labelStr));
 		break;
 	}
 	if (MMENUITEM( mi )) {
-		if (m)
+		if (m) {
 			gtk_menu_shell_append( (GtkMenuShell *)(m->menu), MMENUITEM( mi ) );
+		}
 
 		g_signal_connect( GTK_OBJECT(MMENUITEM( mi )), "activate",
-				G_CALLBACK(pushMenuItem), mi );
- 		gtk_widget_show(MMENUITEM( mi ));
+		                  G_CALLBACK(pushMenuItem), mi );
+		gtk_widget_show(MMENUITEM( mi ));
 	}
-	
+
 	// this is  a link list of all menu items belonging to a specific menu
 	// is used in automatic processing (macro)??
 	if (m) {
@@ -229,8 +238,8 @@ static wMenuItem_p createMenuItem(
 		m->last = mi;
 	}
 	mi->next = NULL;
-	
-	
+
+
 	if (helpStr != NULL) {
 		wlibAddHelpString( MMENUITEM( mi ), helpStr );
 	}
@@ -240,13 +249,14 @@ static wMenuItem_p createMenuItem(
 
 /**
  * Add a accelerator key to a widget
- * 
+ *
  * @param w         IN unused(?)
  * @param menu      IN unused(?)
  * @param menu_item IN owning widget
  * @param acclKey   IN the accelerator key
  */
-static void setAcclKey( wWin_p w, GtkWidget * menu, GtkWidget * menu_item, int acclKey )
+static void setAcclKey( wWin_p w, GtkWidget * menu, GtkWidget * menu_item,
+                        int acclKey )
 {
 	int mask;
 	static GtkAccelGroup * accel_alpha_group = NULL;
@@ -267,10 +277,10 @@ static void setAcclKey( wWin_p w, GtkWidget * menu, GtkWidget * menu_item, int a
 		gtk_window_add_accel_group(GTK_WINDOW(gtkMainW->gtkwin), accel_nonalpha_group );
 		gtk_accelerator_set_default_mod_mask( oldmods );
 	}
- 
+
 	mask = 0;
 	if (acclKey) {
-		
+
 		if (acclKey&WALT) {
 			mask |= GDK_MOD1_MASK;
 		}
@@ -305,38 +315,38 @@ static void setAcclKey( wWin_p w, GtkWidget * menu, GtkWidget * menu_item, int a
 			mask |= GDK_CONTROL_MASK;
 		}
 		gtk_widget_add_accelerator( menu_item, "activate",
-			(isalpha(acclKey&0xFF)?accel_alpha_group:accel_nonalpha_group),
-			toupper(acclKey&0xFF), mask, GTK_ACCEL_VISIBLE|GTK_ACCEL_LOCKED );
+		                            (isalpha(acclKey&0xFF)?accel_alpha_group:accel_nonalpha_group),
+		                            toupper(acclKey&0xFF), mask, GTK_ACCEL_VISIBLE|GTK_ACCEL_LOCKED );
 	}
 }
 
 /*-----------------------------------------------------------------*/
 /**
- * Create a radio button as a menu entry 
+ * Create a radio button as a menu entry
  *
  * \param m 		IN menu to be extended
  * \param helpStr 	IN reference into help
  * \param labelStr 	IN text for entry
  * \param acclKey 	IN accelerator key to add
- * \param action 	IN callback function 
+ * \param action 	IN callback function
  * \param data 		IN application data
  * \param helpStr 	IN
  * \return menu entry
  */
 
 wMenuRadio_p wMenuRadioCreate(
-	wMenu_p m, 
-	const char * helpStr,
-	const char * labelStr,
-	long acclKey,
-	wMenuCallBack_p action,
-	void 	*data )
+        wMenu_p m,
+        const char * helpStr,
+        const char * labelStr,
+        long acclKey,
+        wMenuCallBack_p action,
+        void 	*data )
 {
 	wMenuRadio_p mi;
 
 	mi = (wMenuRadio_p)createMenuItem( m, M_RADIO, helpStr, labelStr, sizeof *mi );
 	//~ if (m->mmtype == MM_POPUP && !testMenuPopup)
-		//~ return mi;
+	//~ return mi;
 	setAcclKey( m->parent, m->menu, MMENUITEM( mi ), acclKey );
 	mi->action = action;
 	mi->data = data;
@@ -351,37 +361,38 @@ wMenuRadio_p wMenuRadioCreate(
  * \return
  */
 
-void wMenuRadioSetActive( 
-	wMenuRadio_p mi )
+void wMenuRadioSetActive(
+        wMenuRadio_p mi )
 {
-	gtk_check_menu_item_set_active( (GtkCheckMenuItem *)MMENUITEM(mi), TRUE ); 
-}	 		
+	gtk_check_menu_item_set_active( (GtkCheckMenuItem *)MMENUITEM(mi), TRUE );
+}
 
 /*-----------------------------------------------------------------*/
 
 /**
- * Create a menu entry 
+ * Create a menu entry
  *
  * \param m 		IN menu to be extended
  * \param helpStr 	IN reference into help
  * \param labelStr 	IN text for entry
  * \param acclKey 	IN acceleratoor key to add
- * \param action 	IN callback function 
+ * \param action 	IN callback function
  * \param data 		IN application data
  * \return menu entry
  */
 
 wMenuPush_p wMenuPushCreate(
-	wMenu_p m, 
-	const char * helpStr,
-	const char * labelStr,
-	long acclKey,
-	wMenuCallBack_p action,
-	void 	*data )
+        wMenu_p m,
+        const char * helpStr,
+        const char * labelStr,
+        long acclKey,
+        wMenuCallBack_p action,
+        void 	*data )
 {
 	wMenuPush_p mi;
 
-	mi = (wMenuPush_p)createMenuItem( m, M_PUSH, helpStr, labelStr, sizeof( struct wMenuPush_t ));
+	mi = (wMenuPush_p)createMenuItem( m, M_PUSH, helpStr, labelStr,
+	                                  sizeof( struct wMenuPush_t ));
 
 	setAcclKey( m->parent, m->menu, MMENUITEM( mi ), acclKey );
 
@@ -395,13 +406,13 @@ wMenuPush_p wMenuPushCreate(
  * Enable menu entry
  *
  * \param mi 		IN menu entry
- * \param enable 	IN new state 
+ * \param enable 	IN new state
  * \return
  */
 
 void wMenuPushEnable(
-	wMenuPush_p mi,
-	wBool_t enable )
+        wMenuPush_p mi,
+        wBool_t enable )
 {
 	mi->enabled = enable;
 	gtk_widget_set_sensitive( GTK_WIDGET(MMENUITEM( mi )), enable );
@@ -419,12 +430,13 @@ void wMenuPushEnable(
  */
 
 wMenu_p wMenuMenuCreate(
-	wMenu_p m, 
-	const char * helpStr,
-	const char * labelStr )
+        wMenu_p m,
+        const char * helpStr,
+        const char * labelStr )
 {
 	wMenu_p mi;
-	mi = (wMenu_p)createMenuItem( m, M_MENU, helpStr, labelStr, sizeof( struct wMenu_t ));
+	mi = (wMenu_p)createMenuItem( m, M_MENU, helpStr, labelStr,
+	                              sizeof( struct wMenu_t ));
 	mi->mmtype = MM_MENU;
 	mi->menu = gtk_menu_new();
 
@@ -442,7 +454,7 @@ wMenu_p wMenuMenuCreate(
  */
 
 void wMenuSeparatorCreate(
-	wMenu_p m ) 
+        wMenu_p m )
 {
 	createMenuItem( m, M_SEPARATOR, NULL, "", sizeof( struct wMenuItem_t ));
 }
@@ -464,46 +476,48 @@ int getMlistOrigin( wMenuList_p ml, GList **pChildren )
 	int count = 0;
 	int found = -1;
 	GtkWidget *mitem = MMENUITEM( ml );
-	
+
 	*pChildren = gtk_container_get_children( GTK_CONTAINER( MPARENT( ml )->menu ));
-	if( !*pChildren )
+	if( !*pChildren ) {
 		return( -1 );
-	
+	}
+
 	while( (mi = g_list_nth_data( *pChildren, count ))) {
 		if( mi == mitem ) {
 			found = TRUE;
 			break;
-		}	
-		else {
+		} else {
 			count++;
-		}	
+		}
 	}
-	
-	if( found )
+
+	if( found ) {
 		return( count );
-	else 
+	} else {
 		return( -1 );
+	}
 }
 
 /**
- * Signal handler for clicking onto a menu list item. 
+ * Signal handler for clicking onto a menu list item.
  * Parameters are the GtkWidget as expected and the pointer to the MenuListItem
  *
  * \param widget IN the GtkWidget
- * \param value  IN the menu list item 
+ * \param value  IN the menu list item
  * \return
  */
 
 static void pushMenuList(
-	GtkWidget * widget,
-	gpointer value )
+        GtkWidget * widget,
+        gpointer value )
 {
 	// pointer to the list item
 	wMenuListItem_p ml = (wMenuListItem_p)value;
 
-	if (MRECURSION( ml ))
+	if (MRECURSION( ml )) {
 		return;
-	
+	}
+
 	if (ml->mlist->count <= 0) {
 		// this should never happen
 		fprintf( stderr, "pushMenuItem: empty list\n" );
@@ -514,31 +528,32 @@ static void pushMenuList(
 		const char * itemLabel;
 
 		itemLabel = gtk_menu_item_get_label( GTK_MENU_ITEM( widget ));
-		
-		ml->mlist->action( 0, itemLabel, ml->data );	
+
+		ml->mlist->action( 0, itemLabel, ml->data );
 		return;
 	}
 	fprintf( stderr, "pushMenuItem: item (%lx) not found\n", (long)widget );
 }
 
 /**
- * Create a list menu entry 
+ * Create a list menu entry
  *
  * \param m 		IN menu to be extended
  * \param helpStr 	IN reference into help
  * \param max 		IN maximum number of elements
- * \param action 	IN callback function 
+ * \param action 	IN callback function
  * \return menu entry
  */
 
 wMenuList_p wMenuListCreate(
-	wMenu_p m, 
-	const char * helpStr,
-	int max,
-	wMenuListCallBack_p action )
+        wMenu_p m,
+        const char * helpStr,
+        int max,
+        wMenuListCallBack_p action )
 {
 	wMenuList_p mi;
-	mi = (wMenuList_p)createMenuItem( m, M_LIST, NULL, _("<Empty List>"), sizeof( struct wMenuList_t ));
+	mi = (wMenuList_p)createMenuItem( m, M_LIST, NULL, _("<Empty List>"),
+	                                  sizeof( struct wMenuList_t ));
 	gtk_widget_set_sensitive( GTK_WIDGET(MMENUITEM( mi )), FALSE );
 	mi->next = NULL;
 	mi->count = 0;
@@ -551,90 +566,96 @@ wMenuList_p wMenuListCreate(
 
 /**
  * Add a new item to a list of menu entries
- * The placeholder for the list is looked up. Then the new item is added immediately 
+ * The placeholder for the list is looked up. Then the new item is added immediately
  * behind it. In case the maximum number of items is reached the last item is removed.
  *
  * \param ml 		IN handle for the menu list - the placeholder item
  * \param index 	IN position of new menu item
- * \param labelStr 	IN the menu label for the new item 
+ * \param labelStr 	IN the menu label for the new item
  * \param data 		IN application data for the new item
- * \return    
+ * \return
  */
 
 void wMenuListAdd(
-	wMenuList_p ml,
-	int index,
-	const char * labelStr,
-	const void * data )
+        wMenuList_p ml,
+        int index,
+        const char * labelStr,
+        const void * data )
 {
 	int i = 0;
 	GList * children;
 
 	i = getMlistOrigin( ml, &children );
-	
+
 	if( i > -1 ) {
 		wMenuListItem_p mi;
 
 		// we're adding an item, so hide the default placeholder
 		gtk_widget_hide( MMENUITEM( ml ));
-		
+
 		// delete an earlier entry with the same label
-		wMenuListDelete( ml, labelStr );		
+		wMenuListDelete( ml, labelStr );
 
 		// a new item
 		ml->count ++;
-		
+
 		// is there a maximum number of items set and reached with the new item?
 		if(( ml->max != -1 ) && ( ml->count > ml-> max )) {
 			wMenuListItem_p mold;
 			GtkWidget * item;
-	
+
 			// get the last item in the list
 			item = g_list_nth_data( children, i + ml->max );
 			// get the pointer to the data structure
 			mold = g_object_get_data( G_OBJECT( item ), WLISTITEM );
 			// kill the menu entry
 			gtk_widget_destroy( item );
-			// free the data 
+			// free the data
 			free( (void *)mold->labelStr );
 			free( (void *)mold );
 
 			ml->count--;
-		}	
-		
+		}
+
 		// create the new menu item and initialize the data fields
-		mi = (wMenuListItem_p)wlibAlloc( NULL, B_MENUITEM, 0, 0, labelStr, sizeof( struct wMenuListItem_t ), NULL );
+		mi = (wMenuListItem_p)wlibAlloc( NULL, B_MENUITEM, 0, 0, labelStr,
+		                                 sizeof( struct wMenuListItem_t ), NULL );
 		MITEMTYPE( mi ) = M_LISTITEM;
 		MMENUITEM( mi ) = gtk_menu_item_new_with_label(wlibConvertInput(mi->labelStr));
 		mi->data = (void *)data;
 		mi->mlist = ml;
 		g_object_set_data( G_OBJECT(MMENUITEM( mi )), WLISTITEM,  mi );
-		
+
 		// add the item to the menu
-		if ( index < 0 )
+		if ( index < 0 ) {
 			index = 0;
-		if ( index >= ml->count )
+		}
+		if ( index >= ml->count ) {
 			index = ml->count - 1;
-		gtk_menu_shell_insert((GtkMenuShell *)(MPARENT( ml )->menu), MMENUITEM( mi ), i + index + 1 );
-		g_signal_connect( GTK_OBJECT(MMENUITEM( mi )), "activate", G_CALLBACK(pushMenuList), mi );
-	
+		}
+		gtk_menu_shell_insert((GtkMenuShell *)(MPARENT( ml )->menu), MMENUITEM( mi ),
+		                      i + index + 1 );
+		g_signal_connect( GTK_OBJECT(MMENUITEM( mi )), "activate",
+		                  G_CALLBACK(pushMenuList), mi );
+
 		gtk_widget_show(MMENUITEM( mi ));
 	}
-	
-	if( children )
+
+	if( children ) {
 		g_list_free( children );
+	}
 }
 
 /**
  * Remove the menu entry identified by a given label.
  *
  * \param ml IN menu list
- * \param labelStr IN label string of item 
+ * \param labelStr IN label string of item
  */
 
 void wMenuListDelete(
-	wMenuList_p ml,
-	const char * labelStr )
+        wMenuList_p ml,
+        const char * labelStr )
 {
 	int i;
 	int found = FALSE;
@@ -642,30 +663,31 @@ void wMenuListDelete(
 
 	// find the placeholder for the list in the menu
 	i = getMlistOrigin( ml, &children );
-	
+
 	if( i > -1 ) {
 		int origin;
-		GtkWidget * item;			
+		GtkWidget * item;
 		char * labelStrConverted;
-		
+
 		// starting from the placeholder, find the menu item with the correct text
 		found = FALSE;
 		labelStrConverted = wlibConvertInput( labelStr );
 		origin = i;
-		
+
 		// get menu item
 		// get label of item
 		// compare items
 		//    if identical, leave loop
 		while( i <= origin + ml->count && !found ) {
 			const char * itemLabel;
-			
+
 			item = g_list_nth_data( children, i );
 			itemLabel = gtk_menu_item_get_label( GTK_MENU_ITEM( item ));
-			if( !g_utf8_collate (itemLabel, labelStrConverted ))
+			if( !g_utf8_collate (itemLabel, labelStrConverted )) {
 				found = TRUE;
-			else
+			} else {
 				i++;
+			}
 		}
 		if( found ) {
 			wMenuListItem_p mold;
@@ -673,45 +695,47 @@ void wMenuListDelete(
 			mold = g_object_get_data( G_OBJECT( item ), WLISTITEM );
 			// kill the menu entry
 			gtk_widget_destroy( item );
-			// free the data 
+			// free the data
 			free( (void *)mold->labelStr );
 			free( (void *)mold );
 
-			ml->count--;	
+			ml->count--;
 		}
-	}	
-	
-	if( children )
+	}
+
+	if( children ) {
 		g_list_free( children );
+	}
 }
 
 /**
  * Get the label and the application data of a specific menu list item
  *
- * \param ml 	IN menu list 
+ * \param ml 	IN menu list
  * \param index IN item within list
  * \param data	OUT	application data
  * \return    item label
  */
 
-const char * 
+const char *
 wMenuListGet( wMenuList_p ml, int index, void ** data )
 {
 	int i;
 
 	GList * children;
 	const char * itemLabel = NULL;
-	
+
 	// check whether index is in range, if not return immediately
 	if ( index >= ml->count || ml->count <= 0 ) {
-		if (data)
+		if (data) {
 			*data = NULL;
+		}
 		return NULL;
 	}
-	
+
 	// find the placeholder for the list in the menu
 	i = getMlistOrigin( ml, &children );
-	
+
 	if( i > -1 ) {
 		GtkWidget * item;
 		wMenuListItem_p mold;
@@ -721,10 +745,11 @@ wMenuListGet( wMenuList_p ml, int index, void ** data )
 		mold = g_object_get_data( G_OBJECT( GTK_MENU_ITEM( item ) ), WLISTITEM );
 		*data = mold->data;
 	}
-	
-	if( children )
+
+	if( children ) {
 		g_list_free( children );
-	
+	}
+
 	return itemLabel;
 }
 
@@ -735,16 +760,17 @@ wMenuListGet( wMenuList_p ml, int index, void ** data )
  */
 
 void wMenuListClear(
-	wMenuList_p ml )
+        wMenuList_p ml )
 {
 	int origin;
 	GList * children;
 
-	if (ml->count == 0)
+	if (ml->count == 0) {
 		return;
+	}
 
 	origin = getMlistOrigin( ml, &children );
-		
+
 	if( origin > -1 ) {
 		int i;
 
@@ -752,23 +778,24 @@ void wMenuListClear(
 		while( i < origin + ml->count ) {
 			wMenuListItem_p mold;
 			GtkWidget * item;
-			
+
 			item = g_list_nth_data( children, i + 1 );
 			mold = g_object_get_data( G_OBJECT( item ), WLISTITEM );
 			// kill the menu entry
 			gtk_widget_destroy( item );
-			// free the data 
+			// free the data
 			free( (void *)mold->labelStr );
 			free( (void *)mold );
 			i++;
-		}	
-	}	
+		}
+	}
 
 	ml->count = 0;
 	gtk_widget_show( MMENUITEM( ml ));
-	
-	if( children )
+
+	if( children ) {
 		g_list_free( children );
+	}
 }
 /*-----------------------------------------------------------------*/
 /**
@@ -779,30 +806,31 @@ void wMenuListClear(
  * \param labelStr 	IN text for entry
  * \param acclKey 	IN acceleratoor key to add
  * \param set 		IN initial state
- * \param action 	IN callback function  
+ * \param action 	IN callback function
  * \param data 		IN application data
  * \return menu entry
  */
 
 wMenuToggle_p wMenuToggleCreate(
-	wMenu_p m, 
-	const char * helpStr,
-	const char * labelStr,
-	long acclKey,
-	wBool_t set,
-	wMenuCallBack_p action,
-	void * data )
+        wMenu_p m,
+        const char * helpStr,
+        const char * labelStr,
+        long acclKey,
+        wBool_t set,
+        wMenuCallBack_p action,
+        void * data )
 {
 	wMenuToggle_p mt;
 
-	mt = (wMenuToggle_p)createMenuItem( m, M_TOGGLE, helpStr, labelStr, sizeof( struct wMenuToggle_t ));
+	mt = (wMenuToggle_p)createMenuItem( m, M_TOGGLE, helpStr, labelStr,
+	                                    sizeof( struct wMenuToggle_t ));
 	setAcclKey( m->parent, m->menu, MMENUITEM( mt ), acclKey );
 	mt->action = action;
 	mt->data = data;
 	mt->enabled = TRUE;
 	MPARENT( mt ) = m;
 	wMenuToggleSet( mt, set );
-	
+
 	return mt;
 }
 
@@ -814,7 +842,7 @@ wMenuToggle_p wMenuToggleCreate(
  */
 
 wBool_t wMenuToggleGet(
-	wMenuToggle_p mt )
+        wMenuToggle_p mt )
 {
 	return mt->set;
 }
@@ -828,11 +856,11 @@ wBool_t wMenuToggleGet(
  */
 
 wBool_t wMenuToggleSet(
-	wMenuToggle_p mt,
-	wBool_t set )
+        wMenuToggle_p mt,
+        wBool_t set )
 {
 	wBool_t rc;
-	if (mt==NULL) return 0;
+	if (mt==NULL) { return 0; }
 	MRECURSION( mt )++;
 	gtk_check_menu_item_set_active( GTK_CHECK_MENU_ITEM(MMENUITEM( mt )), set );
 	MRECURSION( mt )--;
@@ -845,13 +873,13 @@ wBool_t wMenuToggleSet(
  * Enable menu entry containing a check box
  *
  * \param mi 		IN menu entry
- * \param enable 	IN new state 
+ * \param enable 	IN new state
  * \return
  */
 
 void wMenuToggleEnable(
-	wMenuToggle_p mt,
-	wBool_t enable )
+        wMenuToggle_p mt,
+        wBool_t enable )
 {
 	mt->enabled = enable;
 }
@@ -860,29 +888,30 @@ void wMenuToggleEnable(
 /*-----------------------------------------------------------------*/
 
 /**
- * Set the text for a menu 
+ * Set the text for a menu
  *
  * \param m 		IN menu entry
  * \param labelStr 	IN new text
  * \return
  */
 
-void wMenuSetLabel( wMenu_p m, const char * labelStr) {
+void wMenuSetLabel( wMenu_p m, const char * labelStr)
+{
 	wlibSetLabel( m->widget, m->option, labelStr, &m->labelG, &m->imageG );
 }
 
 /**
- * Signal handler for menu items. Parameters are the GtkWidget as 
+ * Signal handler for menu items. Parameters are the GtkWidget as
  * expected and the pointer to the MenuListItem
  *
  * \param widget IN the GtkWidget
- * \param value  IN the menu list item 
+ * \param value  IN the menu list item
  * \return
  */
 
 static gint pushMenu(
-	GtkWidget * widget,
-	wMenu_p m )
+        GtkWidget * widget,
+        wMenu_p m )
 {
 	gtk_menu_popup( GTK_MENU(m->menu), NULL, NULL, NULL, NULL, 0, 0 );
 	/* Tell calling code that we have handled this event; the buck
@@ -903,12 +932,12 @@ static gint pushMenu(
  */
 
 wMenu_p wMenuCreate(
-	wWin_p	parent,
-	wWinPix_t	x,
-	wWinPix_t	y,
-	const char 	* helpStr,
-	const char	* labelStr,
-	long	option )
+        wWin_p	parent,
+        wWinPix_t	x,
+        wWinPix_t	y,
+        const char 	* helpStr,
+        const char	* labelStr,
+        long	option )
 {
 	wMenu_p m;
 	m = wlibAlloc( parent, B_MENU, x, y, labelStr, sizeof( struct wMenu_t ), NULL );
@@ -920,12 +949,12 @@ wMenu_p wMenuCreate(
 
 	m->widget = gtk_button_new();
 	g_signal_connect (GTK_OBJECT(m->widget), "clicked",
-			G_CALLBACK(pushMenu), m );
+	                  G_CALLBACK(pushMenu), m );
 
 	m->menu = gtk_menu_new();
 
 	wMenuSetLabel( m, labelStr );
-	
+
 	gtk_fixed_put( GTK_FIXED(parent->widget), m->widget, m->realX, m->realY );
 	wlibControlGetSize( (wControl_p)m );
 	if ( m->w < 80 && (m->option&BO_ICON)==0) {
@@ -939,27 +968,27 @@ wMenu_p wMenuCreate(
 }
 
 /**
- * Add a drop-down menu to the menu bar. 
+ * Add a drop-down menu to the menu bar.
  *
- * \param w 		IN main window handle 
+ * \param w 		IN main window handle
  * \param helpStr 	IN unused (should be help topic )
- * \param labelStr 	IN label for the drop-down menu 
+ * \param labelStr 	IN label for the drop-down menu
  * \return    pointer to the created drop-down menu
  */
 
 wMenu_p wMenuBarAdd(
-	wWin_p w,
-	const char * helpStr,
-	const char * labelStr )
+        wWin_p w,
+        const char * helpStr,
+        const char * labelStr )
 {
 	wMenu_p m;
 	GtkWidget * menuItem;
-	
+
 	m = wlibAlloc( w, B_MENU, 0, 0, labelStr, sizeof( struct wMenu_t ), NULL );
 	m->mmtype = MM_BAR;
 	m->realX = 0;
 	m->realY = 0;
-	
+
 	menuItem = gtk_menu_item_new_with_mnemonic( wlibConvertInput(m->labelStr) );
 	m->menu = gtk_menu_new();
 	gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), m->menu );
@@ -968,10 +997,10 @@ wMenu_p wMenuBarAdd(
 
 	m->w = 0;
 	m->h = 0;
-	
+
 	/* TODO: why is help not supported here? */
 	/*gtkAddHelpString( m->panel_item, helpStr );*/
-	
+
 	return m;
 }
 
@@ -982,13 +1011,13 @@ wMenu_p wMenuBarAdd(
  * Create a popup menu (context menu)
  *
  * \param w 		IN parent window
- * \param labelStr 	IN label 
+ * \param labelStr 	IN label
  * \return    the created menu
  */
 
 wMenu_p wMenuPopupCreate(
-	wWin_p w,
-	const char * labelStr )
+        wWin_p w,
+        const char * labelStr )
 {
 	wMenu_p b;
 	b = wlibAlloc( w, B_MENU, 0, 0, labelStr, sizeof *b, NULL );
@@ -999,10 +1028,11 @@ wMenu_p wMenuPopupCreate(
 	b->w = 0;
 	b->h = 0;
 	g_signal_connect( GTK_OBJECT (b->menu), "key_press_event",
-			G_CALLBACK(catch_shift_ctrl_alt_keys), b);
+	                  G_CALLBACK(catch_shift_ctrl_alt_keys), b);
 	g_signal_connect( GTK_OBJECT (b->menu), "key_release_event",
-			G_CALLBACK (catch_shift_ctrl_alt_keys), b);
-	gtk_widget_set_events ( GTK_WIDGET(b->menu), GDK_EXPOSURE_MASK|GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK );
+	                  G_CALLBACK (catch_shift_ctrl_alt_keys), b);
+	gtk_widget_set_events ( GTK_WIDGET(b->menu),
+	                        GDK_EXPOSURE_MASK|GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK );
 	return b;
 }
 
@@ -1023,30 +1053,30 @@ void wMenuPopupShow( wMenu_p mp )
 /**
  * ?? Seems to be related to macro / automatic playback functionality
  *
- * \param m 	IN 
- * \param func 	IN 
- * \param data 	IN 
+ * \param m 	IN
+ * \param func 	IN
+ * \param data 	IN
  */
 
 void wMenuSetTraceCallBack(
-	wMenu_p m,
-	wMenuTraceCallBack_p func,
-	void * data )
+        wMenu_p m,
+        wMenuTraceCallBack_p func,
+        void * data )
 {
 	m->traceFunc = func;
 	m->traceData = data;
 }
 
 /**
- * ??? same as above 
- * \param m 	IN 
- * \param label IN 
+ * ??? same as above
+ * \param m 	IN
+ * \param label IN
  * \return    describe the return value
  */
 
 wBool_t wMenuAction(
-	wMenu_p m,
-	const char * label )
+        wMenu_p m,
+        const char * label )
 {
 	wMenuItem_p mi;
 	wMenuToggle_p mt;
@@ -1056,10 +1086,11 @@ wBool_t wMenuAction(
 			case M_SEPARATOR:
 				break;
 			case M_PUSH:
-				if ( ((wMenuPush_p)mi)->enabled == FALSE )
+				if ( ((wMenuPush_p)mi)->enabled == FALSE ) {
 					wBeep();
-				else
+				} else {
 					((wMenuPush_p)mi)->action( ((wMenuPush_p)mi)->data );
+				}
 				break;
 			case M_TOGGLE:
 				mt = (wMenuToggle_p)mi;
@@ -1076,7 +1107,7 @@ wBool_t wMenuAction(
 				break;
 			default:
 				/*fprintf(stderr, "Oops: wMenuAction\n");*/
-			break;
+				break;
 			}
 			return TRUE;
 		}