dwindows: mac/dw.m comparison

Added new dw_window_set_focus() function and attempted to fix... Intial focus after a subsequent dw_window_show() on Mac.

comparison

equal deleted inserted replaced

-:97b1edb41d44
+:9304241b7b33
 if([ object isMemberOfClass:[ DWWindow class ] ])
 {
 DWWindow *window = handle;
 NSRect rect = [[window contentView] frame];
+id defaultitem = [window initialFirstResponder];
 if([window isMiniaturized])
 {
 [window deminiaturize:nil];
 }
 {
 /* Fix incorrect repeat in displaying textured windows */
 [window setAutorecalculatesContentBorderThickness:NO forEdge:NSMinYEdge];
 [window setContentBorderThickness:0.0 forEdge:NSMinYEdge];
 }
+if(defaultitem)
+{
+/* If there is a default item set, make it first responder */
+[window makeFirstResponder:defaultitem];
+}
 }
 return 0;
 }
 /*
 }
 }
 }
 /*
+* Sets the current focus item for a window/dialog.
+* Parameters:
+*         handle: Handle to the dialog item to be focused.
+* Remarks:
+*          This is for use after showing the window/dialog.
+*/
+void API dw_window_set_focus(HWND handle)
+{
+id object = handle;
+[[object window] makeFirstResponder:object];
+}
+/*
 * Sets the default focus item for a window/dialog.
 * Parameters:
 *         window: Toplevel window or dialog.
 *         defaultitem: Handle to the dialog item to be default.
+* Remarks:
+*          This is for use before showing the window/dialog.
 */
 void API dw_window_default(HWND handle, HWND defaultitem)
 {
 DWWindow *window = handle;
 id object = defaultitem;

Mercurial > dwindows