dwindows: mac/dw.m comparison

comparison mac/dw.m @ 676:9861d264925d

MLE was missing the scrollbar. Fixes for getting and setting the position. However it still currently does not work until the window is shown.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 01 Mar 2011 04:37:11 +0000
parents	48f8efba898f
children	99002595f549

comparison

equal deleted inserted replaced

-:48f8efba898f
+:9861d264925d
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_mle_new(ULONG id)
 {
 	DWMLE *mle = [[DWMLE alloc] init];
-	return mle;
+NSScrollView *scrollview  = [[NSScrollView alloc] init];
+//[mle setScrollview:scrollview];
+[scrollview setBorderType:NSBezelBorder];
+[scrollview setHasVerticalScroller:YES];
+[scrollview setAutohidesScrollers:YES];
+[scrollview setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable];
+[scrollview setDocumentView:mle];
+[mle setAutoresizingMask:NSViewWidthSizable];
+	return scrollview;
 }
 /*
 * Adds text to an MLE box and returns the current point.
 * Parameters:
 *          buffer: Text buffer to be imported.
 *          startpoint: Point to start entering text.
 */
 unsigned int API dw_mle_import(HWND handle, char *buffer, int startpoint)
 {
-	DWMLE *mle = handle;
+NSScrollView *sv = handle;
+	DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSString *nstr = [NSString stringWithUTF8String:buffer];
 NSMutableString *ms = [ts mutableString];
 [ms insertString:nstr atIndex:(startpoint+1)];
 	return (unsigned int)strlen(buffer) + startpoint;
 *          startpoint: Point to start grabbing text.
 *          length: Amount of text to be grabbed.
 */
 void API dw_mle_export(HWND handle, char *buffer, int startpoint, int length)
 {
-	DWMLE *mle = handle;
+NSScrollView *sv = handle;
+	DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 strncpy(buffer, [ms UTF8String], length);
 }
 *          bytes: A pointer to a variable to return the total bytes.
 *          lines: A pointer to a variable to return the number of lines.
 */
 void API dw_mle_get_size(HWND handle, unsigned long *bytes, unsigned long *lines)
 {
-	DWMLE *mle = handle;
+NSScrollView *sv = handle;
+	DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 *bytes = [ms length];
 *lines = 0; /* TODO: Line count */
 *          startpoint: Point to start deleting text.
 *          length: Amount of text to be deleted.
 */
 void API dw_mle_delete(HWND handle, int startpoint, int length)
 {
-	DWMLE *mle = handle;
+NSScrollView *sv = handle;
+	DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 [ms deleteCharactersInRange:NSMakeRange(startpoint+1, length)];
 }
 * Parameters:
 *          handle: Handle to the MLE to be cleared.
 */
 void API dw_mle_clear(HWND handle)
 {
-	DWMLE *mle = handle;
+NSScrollView *sv = handle;
+	DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 NSUInteger length = [ms length];
 [ms deleteCharactersInRange:NSMakeRange(0, length)];
 }
 *          handle: Handle to the MLE.
 *          state: TRUE if it can be edited, FALSE for readonly.
 */
 void API dw_mle_set_editable(HWND handle, int state)
 {
-	DWMLE *mle = handle;
+NSScrollView *sv = handle;
+	DWMLE *mle = [sv documentView];
 	if(state)
 	{
 		[mle setEditable:YES];
 	}
 	else
 *          handle: Handle to the MLE.
 *          state: TRUE if it wraps, FALSE if it doesn't.
 */
 void API dw_mle_set_word_wrap(HWND handle, int state)
 {
-DWMLE *mle = handle;
+NSScrollView *sv = handle;
+	DWMLE *mle = [sv documentView];
 if(state)
 {
 [mle setHorizontallyResizable:NO];
 }
 else
 *       handle: The handle to the splitbar returned by dw_splitbar_new().
 */
 void API dw_splitbar_set(HWND handle, float percent)
 {
 	DWSplitBar *split = handle;
-	[split setPosition:percent ofDividerAtIndex:0];
+NSRect rect = [split frame];
+float pos;
+if([split isVertical])
+{
+pos = rect.size.height * (percent / 100.0);
+}
+else
+{
+pos = rect.size.width * (percent / 100.0);
+}
+	[split setPosition:pos ofDividerAtIndex:0];
 }
 /*
 * Gets the position of a splitbar (pecentage).
 * Parameters:
 *       handle: The handle to the splitbar returned by dw_splitbar_new().
 */
 float API dw_splitbar_get(HWND handle)
 {
-	NSLog(@"dw_splitbar_get() unimplemented\n");
+	DWSplitBar *split = handle;
-	return 0.0;
+NSRect rect1 = [split frame];
+NSArray *subviews = [split subviews];
+NSView *view = [subviews objectAtIndex:0];
+NSRect rect2 = [view frame];
+float pos, total, retval = 0.0;
+if([split isVertical])
+{
+total = rect1.size.height;
+pos = rect2.size.height;
+}
+else
+{
+total = rect1.size.width;
+pos = rect2.size.width;
+}
+if(total > 0)
+{
+retval = pos / total;
+}
+	return retval;
 }
 /*
 * Create a bitmap object to be packed.
 * Parameters:
 *       data: User data to be passed to the handler function.
 */
 void dw_window_set_data(HWND window, char *dataname, void *data)
 {
 	id object = window;
+if([object isMemberOfClass:[NSScrollView class]])
+{
+NSScrollView *sv = window;
+object = [sv documentView];
+}
 	WindowData *blah = (WindowData *)[object userdata];
 	if(!blah)
 	{
 		if(!dataname)
 *       data: User data to be passed to the handler function.
 */
 void *dw_window_get_data(HWND window, char *dataname)
 {
 	id object = window;
+if([object isMemberOfClass:[NSScrollView class]])
+{
+NSScrollView *sv = window;
+object = [sv documentView];
+}
 	WindowData *blah = (WindowData *)[object userdata];
 	if(blah && blah->root && dataname)
 	{
 		UserData *ud = _find_userdata(&(blah->root), dataname);

Mercurial > dwindows

comparison mac/dw.m @ 676:9861d264925d