[vlc-commits] macosx/about: fix layout issue and simply code (close #10746)

[Felix Paul Kühne]

vlc/vlc-2.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Feb 21 14:50:16 2014 +0100| [4c90d3358db73900e806a5f35783428d65cf9d59] | committer: Felix Paul Kühne

macosx/about: fix layout issue and simply code (close #10746)

(cherry picked from commit fe0ec6a107aeb945f2312317c06e955111b21bd4)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=4c90d3358db73900e806a5f35783428d65cf9d59
---

 modules/gui/macosx/about.m |   23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index 3444799..391d6a3 100644
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * about.m: MacOS X About Panel
  *****************************************************************************
- * Copyright (C) 2001-2013 VLC authors and VideoLAN
+ * Copyright (C) 2001-2014 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj at users.sourceforge.net>
@@ -31,13 +31,9 @@
 #import <vlc_about.h>
 #import "CompatibilityFixes.h"
 
-#ifdef __x86_64__
+/* this is a bit weird, but we should be confident that there will be more than
+ * one arch to support again one day */
 #define PLATFORM "Intel 64bit"
-#elif __i386__
-#define PLATFORM "Intel 32bit"
-#else
-#define PLATFORM "PowerPC 32bit"
-#endif
 
 /*****************************************************************************
  * VLAboutBox implementation
@@ -107,10 +103,8 @@ static VLAboutBox *_o_sharedInstance = nil;
         NSString *compiler;
 #ifdef __clang__
         compiler = [NSString stringWithFormat:@"clang %s", __clang_version__];
-#elif __llvm__
-        compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__];
 #else
-        compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__];
+        compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__];
 #endif
         [o_revision_field setStringValue: [NSString stringWithFormat: _NS("Compiled by %s with %@"), VLC_CompileBy(), compiler]];
 
@@ -254,14 +248,7 @@ static VLAboutBox *_o_sharedInstance = nil;
 - (void)showGPL
 {
     [self showAbout];
-    [o_credits_scrollview setHidden:NO];
-    [o_credits_textview setHidden:NO];
-    [o_joinus_txt setHidden:YES];
-
-    [o_credits_textview setString:[NSString stringWithUTF8String:psz_license]];
-
-    [o_credits_textview scrollPoint:NSMakePoint(0, 0)];
-    b_restart = YES;
+    [self buttonAction:nil];
 }
 
 /*****************************************************************************