dwindows: mac/dw.m comparison

Fix for dw_window_set_text() on buttons not working. Implemented dw_mle_get_size() returning the line count.

comparison

equal deleted inserted replaced

-:16964b141964
+:f7016a38bedd
 {
 NSScrollView *sv = handle;
 DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
+NSUInteger numberOfLines, index, stringLength = [ms length];
-*bytes = [ms length];
-*lines = 0; /* TODO: Line count */
+for(index=0, numberOfLines=0; index < stringLength; numberOfLines++)
+index = NSMaxRange([ms lineRangeForRange:NSMakeRange(index, 0)]);
+*bytes = stringLength;
+*lines = numberOfLines;
 }
 /*
 * Deletes text from an MLE box.
 * Parameters:
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 NSObject *object = handle;
-if([ object isKindOfClass:[ NSControl class ] ])
+if([ object isKindOfClass:[ NSWindow class ] ] || [ object isKindOfClass:[ NSButton class ] ])
+{
+id window = handle;
+[window setTitle:[ NSString stringWithUTF8String:text ]];
+}
+else if([ object isKindOfClass:[ NSControl class ] ])
 {
 NSControl *control = handle;
 [control setStringValue:[ NSString stringWithUTF8String:text ]];
-}
-else if([ object isKindOfClass:[ NSWindow class ] ])
-{
-NSWindow *window = handle;
-[window setTitle:[ NSString stringWithUTF8String:text ]];
 }
 DW_MUTEX_UNLOCK;
 }
 /*

Mercurial > dwindows