dwindows: mac/dw.m comparison

comparison mac/dw.m @ 1543:b86a04751ea0

Refactor MLE code on Mac to be more like the Container and Tree code.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Fri, 13 Jan 2012 03:29:23 +0000
parents	333f07bdbf7c
children	ca6be9c48fff

comparison

equal deleted inserted replaced

-:edbc7405ed4d
+:b86a04751ea0
 /* Subclass for a MLE type */
 @interface DWMLE : NSTextView
 {
 void *userdata;
+id scrollview;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
+-(id)scrollview;
+-(void)setScrollview:(id)input;
 @end
 @implementation DWMLE
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
+-(id)scrollview { return scrollview; }
+-(void)setScrollview:(id)input { scrollview = input; }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass NSTextFieldCell for displaying image and text */
 @interface DWImageAndTextCell : NSTextFieldCell
 thiswidth = size.width;
 thisheight = size.height;
 }
 }
 /* MLE, Container and Tree */
-else if([ object isMemberOfClass:[NSScrollView class] ] ||
+else if([ object isMemberOfClass:[DWMLE class] ] ||
 [ object isMemberOfClass:[DWContainer class] ] ||
 [ object isMemberOfClass:[DWTree class] ])
 {
-thiswidth = 500;
+thiswidth = _DW_SCROLLED_MAX_WIDTH;
-thisheight = 200;
+thisheight = _DW_SCROLLED_MAX_HEIGHT;
 }
 /* Any other control type */
 else if([ object isKindOfClass:[ NSControl class ] ])
 nsstr = [object stringValue];
 thisbox = [view box];
 thisitem = thisbox->items;
 object = item;
 /* Query the objects */
-if([ object isKindOfClass:[ DWContainer class ] ])
+if([ object isMemberOfClass:[ DWContainer class ] ] ||
-{
+[ object isMemberOfClass:[ DWTree class ] ] ||
-DWContainer *cont = item;
+[ object isMemberOfClass:[ DWMLE class ] ])
-this = item = [cont scrollview];
+{
-}
+this = item = [object scrollview];
-else if([ object isKindOfClass:[ DWTree class ] ])
-{
-DWTree *tree = item;
-this = item = [tree scrollview];
 }
 /* Do some sanity bounds checking */
 if(index < 0)
 index = 0;
 [scrollview setHasVerticalScroller:YES];
 [scrollview setAutohidesScrollers:YES];
 [scrollview setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable];
 [scrollview setDocumentView:mle];
 [mle setAutoresizingMask:NSViewWidthSizable];
+[mle setScrollview:scrollview];
 /* [mle setTag:cid]; Why doesn't this work? */
 [mle autorelease];
-return scrollview;
+return mle;
 }
 /*
 * 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)
 {
-NSScrollView *sv = handle;
+DWMLE *mle = handle;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSString *nstr = [NSString stringWithUTF8String:buffer];
 NSMutableString *ms = [ts mutableString];
 NSUInteger length = [ms length];
 if(startpoint < 0)
 *          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)
 {
-NSScrollView *sv = handle;
+DWMLE *mle = handle;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 const char *tmp = [ms UTF8String];
 strncpy(buffer, tmp+startpoint, length);
 buffer[length] = '\0';
 *          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)
 {
-NSScrollView *sv = handle;
+DWMLE *mle = handle;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 NSUInteger numberOfLines, index, stringLength = [ms length];
 if(bytes)
 *          startpoint: Point to start deleting text.
 *          length: Amount of text to be deleted.
 */
 void API dw_mle_delete(HWND handle, int startpoint, int length)
 {
-NSScrollView *sv = handle;
+DWMLE *mle = handle;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 NSUInteger mslength = [ms length];
 if(startpoint < 0)
 startpoint = 0;
 * Parameters:
 *          handle: Handle to the MLE to be cleared.
 */
 void API dw_mle_clear(HWND handle)
 {
-NSScrollView *sv = handle;
+DWMLE *mle = handle;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 NSUInteger length = [ms length];
 [ms deleteCharactersInRange:NSMakeRange(0, length)];
 DW_MUTEX_UNLOCK;
 *          handle: Handle to the MLE to be positioned.
 *          line: Line to be visible.
 */
 void API dw_mle_set_visible(HWND handle, int line)
 {
-NSScrollView *sv = handle;
+DWMLE *mle = handle;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 NSUInteger numberOfLines, index, stringLength = [ms length];
 for(index=0, numberOfLines=0; index < stringLength && numberOfLines < line; numberOfLines++)
 *          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)
 {
-NSScrollView *sv = handle;
+DWMLE *mle = 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)
 {
-NSScrollView *sv = handle;
+DWMLE *mle = handle;
-DWMLE *mle = [sv documentView];
 if(state)
 {
 [mle setHorizontallyResizable:NO];
 }
 else
 *          handle: Handle to the MLE to be positioned.
 *          point: Point to position cursor.
 */
 void API dw_mle_set_cursor(HWND handle, int point)
 {
-NSScrollView *sv = handle;
+DWMLE *mle = handle;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 NSUInteger length = [ms length];
 if(point < 0)
 point = 0;
 *          point: Start point of search.
 *          flags: Search specific flags.
 */
 int API dw_mle_search(HWND handle, char *text, int point, unsigned long flags)
 {
-NSScrollView *sv = handle;
+DWMLE *mle = handle;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 NSString *searchForMe = [NSString stringWithUTF8String:text];
 NSRange searchRange = NSMakeRange(point, [ms length] - point);
 NSRange range = NSMakeRange(NSNotFound, 0);
 if(fg)
 {
 [cont setForegroundColor:fg];
 }
 }
-else if([object isKindOfClass:[NSScrollView class]])
+else if([object isMemberOfClass:[DWMLE class]])
 {
-NSScrollView *sv = handle;
+DWMLE *mle = handle;
-DWMLE *mle = [sv documentView];
 if(bg)
 {
 [mle setBackgroundColor:bg];
 }
 if(fg)

Mercurial > dwindows

comparison mac/dw.m @ 1543:b86a04751ea0