dwindows: android/DWindows.kt comparison

Android: Implement dw_menu_item_set_state/check() dw_menu_item_delete() and dw_menu_destroy(). Also enable checkbox handling.

comparison

equal deleted inserted replaced

-:dbfcc0e357d6
+:f803f3b164cf
 } else if(menuitem.submenu == null) {
 if(menuitem.title!!.isEmpty()) {
 group += 1
 } else if(menuitem.menuitem == null) {
 menuitem.menuitem = menu?.add(group, menuitem.id, 0, menuitem.title)
+menuitem.menuitem!!.isCheckable = menuitem.check
+menuitem.menuitem!!.isChecked = menuitem.checked
 menuitem.menuitem!!.setOnMenuItemClickListener(MenuItem.OnMenuItemClickListener { item: MenuItem? ->
 eventHandlerSimple(menuitem, 8)
 true
 })
 }
 menu.children.add(0, menuitem)
 } else {
 menu.children.add(menuitem)
 }
 return menuitem
+}
+fun menuDestroy(menu: DWMenu)
+{
+menu.children.clear()
+runOnUiThread {
+menu.menu!!.clear()
+invalidateOptionsMenu()
+}
+}
+fun menuDeleteItem(menu: DWMenu, cid: Int)
+{
+for(menuitem in menu.children) {
+if(menuitem.id == cid) {
+menu.children.remove(menuitem)
+runOnUiThread {
+menu.menu!!.removeItem(menuitem.id)
+invalidateOptionsMenu()
+}
+}
+}
+}
+fun menuSetState(menu: DWMenu, cid: Int, state: Int)
+{
+for(menuitem in menu.children) {
+if(menuitem.id == cid) {
+// Handle DW_MIS_CHECKED/UNCHECKED
+if((state and ((1 shl 2) or (1 shl 3))) != 0) {
+var checked: Boolean = false
+// Handle DW_MIS_CHECKED
+if ((state and (1 shl 2)) != 0) {
+checked = true
+}
+menuitem.checked = checked
+runOnUiThread {
+menuitem.menuitem!!.isChecked = checked
+invalidateOptionsMenu()
+}
+}
+}
+}
 }
 /*
 * These are the Android calls to actually create the UI...
 * forwarded from the C Dynamic Windows API

Mercurial > dwindows