[135842] trunk/dports/graphics/wxWidgets-3.0

[mojca at macports.org]

Revision: 135842
          https://trac.macports.org/changeset/135842
Author:   mojca at macports.org
Date:     2015-05-05 00:52:51 -0700 (Tue, 05 May 2015)
Log Message:
-----------
wxWidgets-3.0: fix a problem on Yosemite (closes #47567)

Modified Paths:
--------------
    trunk/dports/graphics/wxWidgets-3.0/Portfile

Added Paths:
-----------
    trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-carbon-fontdlgosx.mm.diff

Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/Portfile	2015-05-05 02:57:48 UTC (rev 135841)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile	2015-05-05 07:52:51 UTC (rev 135842)
@@ -11,7 +11,7 @@
 subport             wxPython-3.0 {}
 subport             wxgtk-3.0 {}
 version             3.0.2
-revision            1
+revision            2
 set wxpython_ver    3.0.2.0
 # when revbumping remember to change the revision also for wxPython-3.0
 
@@ -26,7 +26,7 @@
 } elseif {${subport} eq "wxPython-3.0"} {
     wxWidgets.use   wxPython-3.0
     version         3.0.2
-    revision        2
+    revision        3
 } elseif {${subport} eq "wxgtk-3.0"} {
     # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
     # wxgtk-3.0 is here mainly for testing purposes
@@ -88,7 +88,8 @@
 
 patch.dir           ${worksrcpath}/..
 
-patchfiles-append   patch-configure.diff
+patchfiles-append   patch-configure.diff \
+                    patch-upstream-src-osx-carbon-fontdlgosx.mm.diff
 
 # See #44524. This patch will likely be incorporated in WxWidgets 3.0.3?.
 # http://trac.wxwidgets.org/attachment/ticket/16329/wx_webview.patch

Added: trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-carbon-fontdlgosx.mm.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-carbon-fontdlgosx.mm.diff	                        (rev 0)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-carbon-fontdlgosx.mm.diff	2015-05-05 07:52:51 UTC (rev 135842)
@@ -0,0 +1,37 @@
+http://trac.macports.org/ticket/47567
+https://github.com/wxWidgets/wxWidgets/commit/f97112a21e0aadbec49df603f554ebf0088e4207
+
+ Opening the font dialog would result in an exception in
+ RunMixedFontDialog:
+ 
+ -[NSView resetFlags]: unrecognized selector sent to instance 0x6080001285c0
+ 
+ The code in question assumed that NSFontPanel's accessory view either
+ didn't exist or was created by wx, and casted it to
+ wxMacFontPanelAccView* without checking. But this assumption is no
+ longer true on OS X 10.10, the view is apparently pre-set to some
+ default NSView instance.
+ 
+ Fix the code to check accessoryView's class before treating it as
+ wxMacFontPanelAccView.
+
+--- src/osx/carbon/fontdlgosx.mm.orig
++++ src/osx/carbon/fontdlgosx.mm
+@@ -162,6 +162,6 @@
+     [[fontPanel standardWindowButton:NSWindowCloseButton] setEnabled:NO] ;
+ 
+-    wxMacFontPanelAccView* accessoryView = (wxMacFontPanelAccView*) [fontPanel accessoryView] ;
+-    if ( accessoryView == nil)
++    wxMacFontPanelAccView* accessoryView = nil;
++    if ( [fontPanel accessoryView] == nil || [[fontPanel accessoryView] class] != [wxMacFontPanelAccView class] )
+     {
+         NSRect rectBox = NSMakeRect( 0 , 0 , 192 , 40 );
+@@ -171,4 +171,8 @@
+ 
+         [fontPanel setDefaultButtonCell:[[accessoryView okButton] cell]] ;
++    }
++    else
++    {
++        accessoryView = (wxMacFontPanelAccView*)[fontPanel accessoryView];
+     }
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150505/368d27b5/attachment.html>