[109331] trunk/dports/graphics
mojca at macports.org
mojca at macports.org
Tue Aug 13 05:20:00 PDT 2013
Revision: 109331
https://trac.macports.org/changeset/109331
Author: mojca at macports.org
Date: 2013-08-13 05:20:00 -0700 (Tue, 13 Aug 2013)
Log Message:
-----------
wxWidgets30/devel: revert the patch for handling dead keys (reported instabilities in #38850)
Modified Paths:
--------------
trunk/dports/graphics/wxWidgets-devel/Portfile
trunk/dports/graphics/wxWidgets30/Portfile
Removed Paths:
-------------
trunk/dports/graphics/wxWidgets-devel/files/patch-src-osx-cocoa-window.mm.diff
trunk/dports/graphics/wxWidgets30/files/patch-src-osx-cocoa-window.mm.diff
Modified: trunk/dports/graphics/wxWidgets-devel/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-devel/Portfile 2013-08-13 11:54:15 UTC (rev 109330)
+++ trunk/dports/graphics/wxWidgets-devel/Portfile 2013-08-13 12:20:00 UTC (rev 109331)
@@ -8,7 +8,7 @@
conflicts wxgtk wxWidgets
version 2.9.5
epoch 20130804
-revision 1
+revision 2
license wxwidgets-3.1
categories graphics devel
@@ -61,8 +61,7 @@
extract.only ${distname}-${version}${extract.suffix}
patch.dir ${worksrcpath}/..
-patchfiles patch-configure-change_install_names.diff \
- patch-src-osx-cocoa-window.mm.diff
+patchfiles patch-configure-change_install_names.diff
configure.cmd ../configure
configure.ldflags -L${build.dir}/lib -L${prefix}/lib
Deleted: trunk/dports/graphics/wxWidgets-devel/files/patch-src-osx-cocoa-window.mm.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-devel/files/patch-src-osx-cocoa-window.mm.diff 2013-08-13 11:54:15 UTC (rev 109330)
+++ trunk/dports/graphics/wxWidgets-devel/files/patch-src-osx-cocoa-window.mm.diff 2013-08-13 12:20:00 UTC (rev 109331)
@@ -1,114 +0,0 @@
---- src/osx/cocoa/window.mm (revision 74602)
-+++ src/osx/cocoa/window.mm (revision 74613)
-@@ -109,4 +109,20 @@
-
- @end // wxNSView
-+
-+ at interface wxNSView(TextInput) <NSTextInputClient>
-+
-+- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange;
-+- (void)doCommandBySelector:(SEL)aSelector;
-+- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange;
-+- (void)unmarkText;
-+- (NSRange)selectedRange;
-+- (NSRange)markedRange;
-+- (BOOL)hasMarkedText;
-+- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
-+- (NSArray*)validAttributesForMarkedText;
-+- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
-+- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint;
-+
-+ at end
-
- @interface NSView(PossibleMethods)
-@@ -837,4 +853,69 @@
- @end // wxNSView
-
-+// We need to adopt NSTextInputClient protocol in order to interpretKeyEvents: to work.
-+// Currently, only insertText:(replacementRange:) is
-+// implemented here, and the rest of the methods are stubs.
-+// It is hoped that someday IME-related functionality is implemented in
-+// wxWidgets and the methods of this protocol are fully working.
-+
-+ at implementation wxNSView(TextInput)
-+
-+void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text);
-+
-+- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange
-+{
-+ wxOSX_insertText(self, @selector(insertText:), aString);
-+}
-+
-+- (void)doCommandBySelector:(SEL)aSelector
-+{
-+ // these are already caught in the keyEvent handler
-+}
-+
-+- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
-+{
-+}
-+
-+- (void)unmarkText
-+{
-+}
-+
-+- (NSRange)selectedRange
-+{
-+ return NSMakeRange(NSNotFound, 0);
-+}
-+
-+- (NSRange)markedRange
-+{
-+ return NSMakeRange(NSNotFound, 0);
-+}
-+
-+- (BOOL)hasMarkedText
-+{
-+ return NO;
-+}
-+
-+- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
-+{
-+ return nil;
-+}
-+
-+- (NSArray*)validAttributesForMarkedText
-+{
-+ return nil;
-+}
-+
-+- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
-+{
-+ return NSMakeRect(0, 0, 0, 0);
-+}
-+- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint
-+{
-+ return NSNotFound;
-+}
-+
-+ at end // wxNSView(TextInput)
-+
-+
- //
- // event handlers
-@@ -2555,8 +2636,16 @@
- bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
- {
-- wxKeyEvent wxevent(wxEVT_CHAR);
-- SetupKeyEvent( wxevent, event, text );
--
-- return GetWXPeer()->OSXHandleKeyEvent(wxevent);
-+ bool result = false;
-+
-+ for (NSUInteger i = 0; i < [text length]; ++i)
-+ {
-+ wxKeyEvent wxevent(wxEVT_CHAR);
-+ unichar c = [text characterAtIndex:i];
-+ SetupKeyEvent( wxevent, event, [NSString stringWithCharacters:&c length:1]);
-+
-+ result = GetWXPeer()->OSXHandleKeyEvent(wxevent) || result;
-+ }
-+
-+ return result;
- }
-
Modified: trunk/dports/graphics/wxWidgets30/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets30/Portfile 2013-08-13 11:54:15 UTC (rev 109330)
+++ trunk/dports/graphics/wxWidgets30/Portfile 2013-08-13 12:20:00 UTC (rev 109331)
@@ -7,7 +7,7 @@
conflicts wxgtk wxWidgets
version 2.9.5
epoch 20130804
-revision 1
+revision 2
license wxwidgets-3.1
categories graphics devel
@@ -53,8 +53,7 @@
extract.only ${distname}-${version}${extract.suffix}
patch.dir ${worksrcpath}/..
-patchfiles patch-configure-change_install_names.diff \
- patch-src-osx-cocoa-window.mm.diff
+patchfiles patch-configure-change_install_names.diff
configure.cmd ../configure
configure.ldflags -L${build.dir}/lib -L${prefix}/lib
Deleted: trunk/dports/graphics/wxWidgets30/files/patch-src-osx-cocoa-window.mm.diff
===================================================================
--- trunk/dports/graphics/wxWidgets30/files/patch-src-osx-cocoa-window.mm.diff 2013-08-13 11:54:15 UTC (rev 109330)
+++ trunk/dports/graphics/wxWidgets30/files/patch-src-osx-cocoa-window.mm.diff 2013-08-13 12:20:00 UTC (rev 109331)
@@ -1,114 +0,0 @@
---- src/osx/cocoa/window.mm (revision 74602)
-+++ src/osx/cocoa/window.mm (revision 74613)
-@@ -109,4 +109,20 @@
-
- @end // wxNSView
-+
-+ at interface wxNSView(TextInput) <NSTextInputClient>
-+
-+- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange;
-+- (void)doCommandBySelector:(SEL)aSelector;
-+- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange;
-+- (void)unmarkText;
-+- (NSRange)selectedRange;
-+- (NSRange)markedRange;
-+- (BOOL)hasMarkedText;
-+- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
-+- (NSArray*)validAttributesForMarkedText;
-+- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
-+- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint;
-+
-+ at end
-
- @interface NSView(PossibleMethods)
-@@ -837,4 +853,69 @@
- @end // wxNSView
-
-+// We need to adopt NSTextInputClient protocol in order to interpretKeyEvents: to work.
-+// Currently, only insertText:(replacementRange:) is
-+// implemented here, and the rest of the methods are stubs.
-+// It is hoped that someday IME-related functionality is implemented in
-+// wxWidgets and the methods of this protocol are fully working.
-+
-+ at implementation wxNSView(TextInput)
-+
-+void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text);
-+
-+- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange
-+{
-+ wxOSX_insertText(self, @selector(insertText:), aString);
-+}
-+
-+- (void)doCommandBySelector:(SEL)aSelector
-+{
-+ // these are already caught in the keyEvent handler
-+}
-+
-+- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
-+{
-+}
-+
-+- (void)unmarkText
-+{
-+}
-+
-+- (NSRange)selectedRange
-+{
-+ return NSMakeRange(NSNotFound, 0);
-+}
-+
-+- (NSRange)markedRange
-+{
-+ return NSMakeRange(NSNotFound, 0);
-+}
-+
-+- (BOOL)hasMarkedText
-+{
-+ return NO;
-+}
-+
-+- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
-+{
-+ return nil;
-+}
-+
-+- (NSArray*)validAttributesForMarkedText
-+{
-+ return nil;
-+}
-+
-+- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
-+{
-+ return NSMakeRect(0, 0, 0, 0);
-+}
-+- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint
-+{
-+ return NSNotFound;
-+}
-+
-+ at end // wxNSView(TextInput)
-+
-+
- //
- // event handlers
-@@ -2555,8 +2636,16 @@
- bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
- {
-- wxKeyEvent wxevent(wxEVT_CHAR);
-- SetupKeyEvent( wxevent, event, text );
--
-- return GetWXPeer()->OSXHandleKeyEvent(wxevent);
-+ bool result = false;
-+
-+ for (NSUInteger i = 0; i < [text length]; ++i)
-+ {
-+ wxKeyEvent wxevent(wxEVT_CHAR);
-+ unichar c = [text characterAtIndex:i];
-+ SetupKeyEvent( wxevent, event, [NSString stringWithCharacters:&c length:1]);
-+
-+ result = GetWXPeer()->OSXHandleKeyEvent(wxevent) || result;
-+ }
-+
-+ return result;
- }
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130813/16c65d11/attachment.html>
More information about the macports-changes
mailing list