Mercurial > dwindows

changeset 1906:fac81560eb09

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a number of warning generated by the new clang in XCode 6.3, assigning "id" to "Box *" now generates a warning and requires a cast. Also minor fix for yosemite Combobox sizes.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 21 Apr 2015 17:12:09 +0000
parents 0d67f00866b7
children 54f9ec5bb793
files mac/dw.m
diffstat 1 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Fri Mar 20 13:48:42 2015 +0000
+++ b/mac/dw.m	Tue Apr 21 17:12:09 2015 +0000
@@ -2,7 +2,7 @@
  * Dynamic Windows:
  *          A GTK like implementation of the MacOS GUI using Cocoa
  *
- * (C) 2011-2013 Brian Smith <brian@dbsoft.org>
+ * (C) 2011-2015 Brian Smith <brian@dbsoft.org>
  * (C) 2011 Mark Hessling <mark@rexx.org>
  *
  * Requires 10.5 or later.
@@ -2762,7 +2762,7 @@
 
         if(thisbox->items[z].type == TYPEBOX)
         {
-            Box *tmp = [handle box];
+            Box *tmp = (Box *)[handle box];
 
             if(tmp)
             {
@@ -2802,7 +2802,7 @@
 
                 if([view isMemberOfClass:[DWBox class]])
                 {
-                    Box *box = [view box];
+                    Box *box = (Box *)[view box];
                     _handle_resize_events(box);
                 }
             }
@@ -2876,7 +2876,7 @@
         if(thisbox->items[z].type == TYPEBOX)
         {
             id box = thisbox->items[z].hwnd;
-            Box *tmp = [box box];
+            Box *tmp = (Box *)[box box];
 
             if(tmp)
             {
@@ -3015,7 +3015,7 @@
                 if(thisbox->items[z].type == TYPEBOX)
                 {
                     id box = thisbox->items[z].hwnd;
-                    Box *tmp = [box box];
+                    Box *tmp = (Box *)[box box];
 
                     if(tmp)
                     {
@@ -3034,7 +3034,7 @@
 
                     if([view isMemberOfClass:[DWBox class]])
                     {
-                        Box *box = [view box];
+                        Box *box = (Box *)[view box];
                         NSSize size = [view frame].size;
                         _do_resize(box, size.width, size.height);
                         _handle_resize_events(box);
@@ -3929,9 +3929,11 @@
                 thiswidth = 50;
             else
                 thiswidth = 150;
-            /* Spinbuttons don't need to be as wide */
+            /* Comboboxes need some extra height for the border...
+             * and even more with the new look in Yosemite.
+             */
             if([object isMemberOfClass:[ DWComboBox class]])
-                extraheight = 4;
+                extraheight = DWOSMinor < 10 ? 4 : 8;
         }
         else
             nsstr = [object stringValue];
@@ -9576,7 +9578,7 @@
          * The following is an attempt to dynamically size a window based on the size of its
          * children before realization. Only applicable when width or height is less than one.
          */
-        if((width < 1 || height < 1) && (thisbox = [[window contentView] box]))
+        if((width < 1 || height < 1) && (thisbox = (Box *)[[window contentView] box]))
         {
             int depth = 0;
 
@@ -9609,7 +9611,7 @@
     {
         Box *thisbox;
 
-        if((thisbox = [[object contentView] box]))
+        if((thisbox = (Box *)[[object contentView] box]))
         {
             int depth = 0;
             NSRect frame;
@@ -9629,7 +9631,7 @@
     {
         Box *thisbox;
 
-        if((thisbox = [object box]))
+        if((thisbox = (Box *)[object box]))
         {
             int depth = 0;