Mercurial > dwindows

changeset 1040:7ea8a428e0cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Attempt at adding support for groupboxes to dw_window_set/get_font() on Mac.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Thu, 26 May 2011 09:25:27 +0000
parents 860d6e73f8bb
children 6a57bf20d8f9
files mac/dw.m
diffstat 1 files changed, 17 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Thu May 26 09:06:02 2011 +0000
+++ b/mac/dw.m	Thu May 26 09:25:27 2011 +0000
@@ -7227,7 +7227,11 @@
             [font set];
             [object unlockFocus];
         }
-        if([object isKindOfClass:[NSControl class]])
+        if([object isMemberOfClass:[DWGroupBox class]])
+        {
+            [object setTitleFont:font];
+        }
+        else if([object isKindOfClass:[NSControl class]])
         {
             [object setFont:font];
             [[object cell] setFont:font];
@@ -7250,10 +7254,18 @@
 char * API dw_window_get_font(HWND handle)
 {
     id object = handle;
-
-    if([object isKindOfClass:[NSControl class]] || [object isMemberOfClass:[DWRender class]])
-    {
-        NSFont *font = [object font];
+    NSFont *font = nil;
+
+    if([object isMemberOfClass:[DWGroupBox class]])
+    {
+        font = [object titleFont];
+    }
+    else if([object isKindOfClass:[NSControl class]] || [object isMemberOfClass:[DWRender class]])
+    {
+         font = [object font];
+    }
+    if(font)
+    {
         NSString *fontname = [font fontName];
         NSString *output = [NSString stringWithFormat:@"%d.%s", (int)[font pointSize], [fontname UTF8String]];
         return strdup([output UTF8String]);