Setting eol-style property to CRLF for some project files.

[wxWidgets.git] / src / osx / cocoa / nonownedwnd.mm

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index f29cb787810bb22506d2c9d553ec9395f661d015..6e617f9bfdbb6a81983d20f1a4705700e75f96ff 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -59,7 +59,7 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
 
 bool shouldHandleSelector(SEL selector)
 {
 
 bool shouldHandleSelector(SEL selector)
 {

-    if (selector == @selector(noop:) 
+    if (selector == @selector(noop:)

             || selector == @selector(complete:)
             || selector == @selector(deleteBackward:)
             || selector == @selector(deleteForward:)
             || selector == @selector(complete:)
             || selector == @selector(deleteBackward:)
             || selector == @selector(deleteForward:)


@@ -72,7 +72,7 @@ bool shouldHandleSelector(SEL selector)
             || selector == @selector(scrollToBeginningOfDocument:)
             || selector == @selector(scrollToEndOfDocument:))
         return false;
             || selector == @selector(scrollToBeginningOfDocument:)
             || selector == @selector(scrollToEndOfDocument:))
         return false;

-        
+

     return true;
 
 }
     return true;
 
 }


@@ -107,7 +107,7 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 
 - (void)doCommandBySelector:(SEL)selector
 {
 
 - (void)doCommandBySelector:(SEL)selector
 {

-    if (shouldHandleSelector(selector) && 
+    if (shouldHandleSelector(selector) &&

         !(selector == @selector(cancel:) || selector == @selector(cancelOperation:)) )
         [super doCommandBySelector:selector];
 }
         !(selector == @selector(cancel:) || selector == @selector(cancelOperation:)) )
         [super doCommandBySelector:selector];
 }


@@ -137,7 +137,7 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 - (void)noResponderFor: (SEL) selector;
 @end
 
 - (void)noResponderFor: (SEL) selector;
 @end
 

-@implementation wxNSPanel 
+@implementation wxNSPanel

 
 - (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation
 {
 
 - (void)setImplementation: (wxNonOwnedWindowCocoaImpl *) theImplementation
 {


@@ -281,8 +281,8 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
         if ( wxpeer )
         {
             wxpeer->HandleActivated(0, false);
         if ( wxpeer )
         {
             wxpeer->HandleActivated(0, false);

-            // Needed for popup window since the firstResponder 
-            // (focus in wx) doesn't change when this 
+            // Needed for popup window since the firstResponder
+            // (focus in wx) doesn't change when this

             // TLW becomes inactive.
             wxFocusEvent event( wxEVT_KILL_FOCUS, wxpeer->GetId());
             event.SetEventObject(wxpeer);
             // TLW becomes inactive.
             wxFocusEvent event( wxEVT_KILL_FOCUS, wxpeer->GetId());
             event.SetEventObject(wxpeer);


@@ -315,19 +315,19 @@ typedef void (*wxOSX_NoResponderHandlerPtr)(NSView* self, SEL _cmd, SEL selector
 
 IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl )
 
 
 IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCocoaImpl , wxNonOwnedWindowImpl )
 

-wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) : 
+wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) :

     wxNonOwnedWindowImpl(nonownedwnd)
 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }
     wxNonOwnedWindowImpl(nonownedwnd)
 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }

-    
-wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl() 
+
+wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl()

 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }
 {
     m_macWindow = NULL;
     m_macFullScreenData = NULL;
 }

-    
+

 wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
 {
     [m_macWindow setImplementation:nil];
 wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
 {
     [m_macWindow setImplementation:nil];


@@ -344,23 +344,23 @@ void wxNonOwnedWindowCocoaImpl::Create( wxWindow* WXUNUSED(parent), const wxPoin
 long style, long extraStyle, const wxString& WXUNUSED(name) )
 {
     static wxNonOwnedWindowController* controller = NULL;
 long style, long extraStyle, const wxString& WXUNUSED(name) )
 {
     static wxNonOwnedWindowController* controller = NULL;

-    
+

     if ( !controller )
         controller =[[wxNonOwnedWindowController alloc] init];
 
 
     int windowstyle = NSBorderlessWindowMask;
     if ( !controller )
         controller =[[wxNonOwnedWindowController alloc] init];
 
 
     int windowstyle = NSBorderlessWindowMask;

-    
-    if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) || 
+
+    if ( style & wxFRAME_TOOL_WINDOW || ( style & wxPOPUP_WINDOW ) ||

             GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )
     {
         m_macWindow = [wxNSPanel alloc];
     }
     else
         m_macWindow = [wxNSWindow alloc];
             GetWXPeer()->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG )
     {
         m_macWindow = [wxNSPanel alloc];
     }
     else
         m_macWindow = [wxNSWindow alloc];

-    
+

     CGWindowLevel level = kCGNormalWindowLevel;
     CGWindowLevel level = kCGNormalWindowLevel;

-    
+

     if ( style & wxFRAME_TOOL_WINDOW )
     {
         windowstyle |= NSUtilityWindowMask;
     if ( style & wxFRAME_TOOL_WINDOW )
     {
         windowstyle |= NSUtilityWindowMask;


@@ -437,21 +437,21 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
 
     if ( ( style & wxSTAY_ON_TOP ) )
         level = kCGUtilityWindowLevel;
 
     if ( ( style & wxSTAY_ON_TOP ) )
         level = kCGUtilityWindowLevel;

-    
+

     NSRect r = wxToNSRect( NULL, wxRect( pos, size) );
     NSRect r = wxToNSRect( NULL, wxRect( pos, size) );

-    
+

     [m_macWindow setImplementation:this];
     [m_macWindow setImplementation:this];

-    
+

     [m_macWindow initWithContentRect:r
         styleMask:windowstyle
         backing:NSBackingStoreBuffered
     [m_macWindow initWithContentRect:r
         styleMask:windowstyle
         backing:NSBackingStoreBuffered

-        defer:NO 
+        defer:NO

         ];
         ];

-        
+

     [m_macWindow setLevel:level];
 
     [m_macWindow setDelegate:controller];
     [m_macWindow setLevel:level];
 
     [m_macWindow setDelegate:controller];

-    
+

     [m_macWindow setAcceptsMouseMovedEvents: YES];
 }
 
     [m_macWindow setAcceptsMouseMovedEvents: YES];
 }
 


@@ -465,7 +465,7 @@ void wxNonOwnedWindowCocoaImpl::Raise()
 {
     [m_macWindow orderWindow:NSWindowAbove relativeTo:0];
 }
 {
     [m_macWindow orderWindow:NSWindowAbove relativeTo:0];
 }

-    
+

 void wxNonOwnedWindowCocoaImpl::Lower()
 {
     [m_macWindow orderWindow:NSWindowBelow relativeTo:0];
 void wxNonOwnedWindowCocoaImpl::Lower()
 {
     [m_macWindow orderWindow:NSWindowBelow relativeTo:0];


@@ -475,14 +475,19 @@ bool wxNonOwnedWindowCocoaImpl::Show(bool show)
 {
     if ( show )
     {
 {
     if ( show )
     {

-        [m_macWindow makeKeyAndOrderFront:nil];
+        wxNonOwnedWindow* wxpeer = GetWXPeer(); 
+        if (wxpeer && !(wxpeer->GetWindowStyle() & wxFRAME_TOOL_WINDOW)) 
+            [m_macWindow makeKeyAndOrderFront:nil]; 
+        else 
+            [m_macWindow orderFront:nil]; 
+

         [[m_macWindow contentView] setNeedsDisplay:YES];
     }
         [[m_macWindow contentView] setNeedsDisplay:YES];
     }

-    else 
+    else

         [m_macWindow orderOut:nil];
     return true;
 }
         [m_macWindow orderOut:nil];
     return true;
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
 {
     return Show(show);
 bool wxNonOwnedWindowCocoaImpl::ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
 {
     return Show(show);


@@ -512,20 +517,20 @@ void wxNonOwnedWindowCocoaImpl::SetExtraStyle( long exStyle )
         int windowStyle = [ m_macWindow styleMask];
         if ( metal && !(windowStyle & NSTexturedBackgroundWindowMask) )
         {
         int windowStyle = [ m_macWindow styleMask];
         if ( metal && !(windowStyle & NSTexturedBackgroundWindowMask) )
         {

-            wxFAIL_MSG( _T("Metal Style cannot be changed after creation") );
+            wxFAIL_MSG( wxT("Metal Style cannot be changed after creation") );

         }
         else if ( !metal && (windowStyle & NSTexturedBackgroundWindowMask ) )
         {
         }
         else if ( !metal && (windowStyle & NSTexturedBackgroundWindowMask ) )
         {

-            wxFAIL_MSG( _T("Metal Style cannot be changed after creation") );
-        }        
+            wxFAIL_MSG( wxT("Metal Style cannot be changed after creation") );
+        }

     }
 }
     }
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
 {
     return true;
 }
 bool wxNonOwnedWindowCocoaImpl::SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
 {
     return true;
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::CanSetTransparent()
 {
     return true;
 bool wxNonOwnedWindowCocoaImpl::CanSetTransparent()
 {
     return true;


@@ -562,27 +567,27 @@ void wxNonOwnedWindowCocoaImpl::GetContentArea( int& left, int &top, int &width,
     width = (int)rect.size.width;
     height = (int)rect.size.height;
 }
     width = (int)rect.size.width;
     height = (int)rect.size.height;
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& WXUNUSED(region))
 {
     return false;
 }
 
 bool wxNonOwnedWindowCocoaImpl::SetShape(const wxRegion& WXUNUSED(region))
 {
     return false;
 }
 

-void wxNonOwnedWindowCocoaImpl::SetTitle( const wxString& title, wxFontEncoding encoding ) 
+void wxNonOwnedWindowCocoaImpl::SetTitle( const wxString& title, wxFontEncoding encoding )

 {
     [m_macWindow setTitle:wxCFStringRef( title , encoding ).AsNSString()];
 }
 {
     [m_macWindow setTitle:wxCFStringRef( title , encoding ).AsNSString()];
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::IsMaximized() const
 {
     return [m_macWindow isZoomed];
 }
 bool wxNonOwnedWindowCocoaImpl::IsMaximized() const
 {
     return [m_macWindow isZoomed];
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::IsIconized() const
 {
     return [m_macWindow isMiniaturized];
 }
 bool wxNonOwnedWindowCocoaImpl::IsIconized() const
 {
     return [m_macWindow isMiniaturized];
 }

-    
+

 void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize )
 {
     if ( iconize )
 void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize )
 {
     if ( iconize )


@@ -590,12 +595,12 @@ void wxNonOwnedWindowCocoaImpl::Iconize( bool iconize )
     else
         [m_macWindow deminiaturize:nil];
 }
     else
         [m_macWindow deminiaturize:nil];
 }

-    
+

 void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize))
 {
     [m_macWindow zoom:nil];
 }
 void wxNonOwnedWindowCocoaImpl::Maximize(bool WXUNUSED(maximize))
 {
     [m_macWindow zoom:nil];
 }

-    
+

 
 // http://cocoadevcentral.com/articles/000028.php
 
 
 // http://cocoadevcentral.com/articles/000028.php
 


@@ -609,7 +614,7 @@ bool wxNonOwnedWindowCocoaImpl::IsFullScreen() const
 {
     return m_macFullScreenData != NULL ;
 }
 {
     return m_macFullScreenData != NULL ;
 }

-    
+

 bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
 {
     if ( show )
 bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
 {
     if ( show )


@@ -634,7 +639,7 @@ bool wxNonOwnedWindowCocoaImpl::ShowFullScreen(bool show, long WXUNUSED(style))
         delete data ;
         m_macFullScreenData = NULL ;
     }
         delete data ;
         m_macFullScreenData = NULL ;
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -650,7 +655,7 @@ void wxNonOwnedWindowCocoaImpl::ScreenToWindow( int *x, int *y )
     nspt = [[m_macWindow contentView] convertPoint:nspt fromView:nil];
     p = wxFromNSPoint([m_macWindow contentView], nspt);
     if ( x )
     nspt = [[m_macWindow contentView] convertPoint:nspt fromView:nil];
     p = wxFromNSPoint([m_macWindow contentView], nspt);
     if ( x )

-        *x = p.x; 
+        *x = p.x;

     if ( y )
         *y = p.y;
 }
     if ( y )
         *y = p.y;
 }