exposing wxOSXGetViewFromResponder

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 290f71c1b4da7bb7ae9a05b83f6bcd6ad5965c2d..b776801191f6c1c24dc72f208a31da60c8c60393 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -296,6 +296,8 @@ public:
     NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
         bool adjustForOrigin = true );
 
     NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
         bool adjustForOrigin = true );
 

+    WXDLLIMPEXP_CORE NSView* wxOSXGetViewFromResponder( NSResponder* responder );
+

     // used for many wxControls
 
     @interface wxNSButton : NSButton
     // used for many wxControls
 
     @interface wxNSButton : NSButton

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index f7c6fcb8c3d6a9d80a15577133352bc644d44a4a..ea2475e0a5945a4d93f4ce70e6cb770eceeadc64 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -41,7 +41,7 @@
 
 // Get the window with the focus
 
 
 // Get the window with the focus
 

-NSView* GetViewFromResponder( NSResponder* responder )
+NSView* wxOSXGetViewFromResponder( NSResponder* responder )

 {
     NSView* view = nil;
     if ( [responder isKindOfClass:[NSTextView class]] )
 {
     NSView* view = nil;
     if ( [responder isKindOfClass:[NSTextView class]] )


@@ -64,7 +64,7 @@ NSView* GetFocusedViewInWindow( NSWindow* keyWindow )
 {
     NSView* focusedView = nil;
     if ( keyWindow != nil )
 {
     NSView* focusedView = nil;
     if ( keyWindow != nil )

-        focusedView = GetViewFromResponder([keyWindow firstResponder]);
+        focusedView = wxOSXGetViewFromResponder([keyWindow firstResponder]);

 
     return focusedView;
 }
 
     return focusedView;
 }


@@ -1362,7 +1362,7 @@ bool wxWidgetCocoaImpl::resignFirstResponder(WXWidget slf, void *_cmd)
     BOOL r = superimpl(slf, (SEL)_cmd);
  
     NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();
     BOOL r = superimpl(slf, (SEL)_cmd);
  
     NSResponder * responder = wxNonOwnedWindowCocoaImpl::GetNextFirstResponder();

-    NSView* otherView = GetViewFromResponder(responder);
+    NSView* otherView = wxOSXGetViewFromResponder(responder);

 
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
     
 
     wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);