ncurses 6.2 - patch 20200613

[ncurses.git] / menu / m_cursor.c

diff --git a/menu/m_cursor.c b/menu/m_cursor.c
index 0293f9073c32c295795700106566a8fd60b8a9f4..3f8e54809137f5d94e7bc1fe531a4c63d14e3451 100644 (file)
--- a/menu/m_cursor.c
+++ b/menu/m_cursor.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -37,7 +38,7 @@
 
 #include "menu.priv.h"
 
 
 #include "menu.priv.h"
 

-MODULE_ID("$Id: m_cursor.c,v 1.20 2005/10/22 23:03:32 tom Exp $")
+MODULE_ID("$Id: m_cursor.c,v 1.23 2020/02/02 23:34:34 tom Exp $")

 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu
 
 /*---------------------------------------------------------------------------
 |   Facility      :  libnmenu


@@ -86,11 +87,11 @@ pos_menu_cursor(const MENU * menu)
   int x = 0, y = 0;
   int err = _nc_menu_cursor_pos(menu, (ITEM *) 0, &y, &x);
 
   int x = 0, y = 0;
   int err = _nc_menu_cursor_pos(menu, (ITEM *) 0, &y, &x);
 

-  T((T_CALLED("pos_menu_cursor(%p)"), menu));
+  T((T_CALLED("pos_menu_cursor(%p)"), (const void *)menu));

 
   if (E_OK == err)
     {
 
   if (E_OK == err)
     {

-      win = menu->userwin ? menu->userwin : stdscr;
+      win = Get_Menu_UserWin(menu);

       sub = menu->usersub ? menu->usersub : win;
       assert(win && sub);
 
       sub = menu->usersub ? menu->usersub : win;
       assert(win && sub);