Mercurial > dwindows

changeset 2577:6fdab466d7a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Android: Fix notebook page change event page always being 0. iOS: Commit a lingering DWMenu fix, menubar might not initialize array.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sat, 22 May 2021 10:00:31 +0000
parents db097ec28c90
children a36448beb7f7
files android/dw.cpp ios/dw.m
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/android/dw.cpp	Sat May 22 00:19:46 2021 +0000
+++ b/android/dw.cpp	Sat May 22 10:00:31 2021 +0000
@@ -521,6 +521,7 @@
 Java_org_dbsoft_dwindows_DWindows_eventHandlerNotebook(JNIEnv* env, jobject obj, jobject obj1, jint message, jlong pageID) {
     void *params[_DW_EVENT_PARAM_SIZE] = { nullptr };
 
+    params[3] = DW_INT_TO_POINTER(pageID);
     params[8] = DW_INT_TO_POINTER(message);
     _dw_event_handler(obj1, params);
 }
--- a/ios/dw.m	Sat May 22 00:19:46 2021 +0000
+++ b/ios/dw.m	Sat May 22 10:00:31 2021 +0000
@@ -7581,7 +7581,7 @@
 HMENUI API dw_menubar_new(HWND location)
 {
     DWWindow *window = location;
-    DWMenu *menu = [[[DWMenu alloc] init] retain];
+    DWMenu *menu = [[[DWMenu alloc] initWithTag:0] retain];
 
     [window setMenu:menu];
     return menu;