diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:57 +0100 |
| commit | 59dccf358523dfc7679d1d8c120452a71e42243c (patch) | |
| tree | f0f3cc006e8157d6bd699bd644b7dd7b35387ac2 /app/wlib/gtklib/menu.c | |
| parent | fd6639655b399a79fb72f494786a4f57da9c90e7 (diff) | |
| parent | d0ca838c7ab297036b4a7c45351761a48fe05efd (diff) | |
Merge branch 'feature/upstrem' into develop
Diffstat (limited to 'app/wlib/gtklib/menu.c')
| -rw-r--r-- | app/wlib/gtklib/menu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/wlib/gtklib/menu.c b/app/wlib/gtklib/menu.c index 79695d4..754f88f 100644 --- a/app/wlib/gtklib/menu.c +++ b/app/wlib/gtklib/menu.c @@ -118,7 +118,7 @@ typedef struct wMenuListItem_t * wMenuListItem_p; struct wMenuToggle_t { WOBJ_COMMON MOBJ_COMMON m; - wMenuToggleCallBack_p action; + wMenuCallBack_p action; wBool_t enabled; wBool_t set; }; @@ -151,7 +151,7 @@ static void pushMenuItem( case M_TOGGLE: mt = (wMenuToggle_p)m; wMenuToggleSet( mt, !mt->set ); - mt->action( mt->set, mt->data ); + mt->action( mt->data ); break; case M_RADIO: /* NOTE: action is only called when radio button is activated, not when deactivated */ @@ -790,7 +790,7 @@ wMenuToggle_p wMenuToggleCreate( const char * labelStr, long acclKey, wBool_t set, - wMenuToggleCallBack_p action, + wMenuCallBack_p action, void * data ) { wMenuToggle_p mt; @@ -904,8 +904,8 @@ static gint pushMenu( wMenu_p wMenuCreate( wWin_p parent, - wPos_t x, - wPos_t y, + wWinPix_t x, + wWinPix_t y, const char * helpStr, const char * labelStr, long option ) @@ -1067,7 +1067,7 @@ wBool_t wMenuAction( wBeep(); } else { wMenuToggleSet( mt, !mt->set ); - mt->action( mt->set, mt->data ); + mt->action( mt->data ); } break; case M_MENU: |