define MIIM_BITMAP &c in wx/msw/missing.h instead of msw/menu.cpp as menuitem.cpp...

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

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index eba768adb8347a26bd02d5282d09dbea70664f4e..f442eef85a0c6808a251cd2c91a6c6278084001e 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -10,23 +10,19 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

-
-#if wxOSX_USE_COCOA
-#include <Cocoa/Cocoa.h>
-#else
-#include <UIKit/UIKit.h>
+#ifndef WX_PRECOMP
+    #include "wx/nonownedwnd.h"
+    #include "wx/frame.h"

 #endif
 
 #endif
 

-#ifdef __WXMAC__

 #include "wx/osx/private.h"
 #include "wx/osx/private.h"

-#endif

 
 NSRect wxToNSRect( NSView* parent, const wxRect& r )
 {
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
     int y = r.y;
     int x = r.x ;
 
 NSRect wxToNSRect( NSView* parent, const wxRect& r )
 {
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
     int y = r.y;
     int x = r.x ;

-    if ( parent != NULL && ![ parent isFlipped ] )
+    if ( parent == NULL || ![ parent isFlipped ] )

         y = frame.size.height - ( r.y + r.height );
     return NSMakeRect(x, y, r.width , r.height);
 }
         y = frame.size.height - ( r.y + r.height );
     return NSMakeRect(x, y, r.width , r.height);
 }


@@ -36,7 +32,7 @@ wxRect wxFromNSRect( NSView* parent, const NSRect& rect )
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
     int y = rect.origin.y;
     int x = rect.origin.x;
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
     int y = rect.origin.y;
     int x = rect.origin.x;

-    if ( parent != NULL && ![ parent isFlipped ] )
+    if ( parent == NULL || ![ parent isFlipped ] )

         y = frame.size.height - (rect.origin.y + rect.size.height);
     return wxRect( x, y, rect.size.width, rect.size.height );
 }
         y = frame.size.height - (rect.origin.y + rect.size.height);
     return wxRect( x, y, rect.size.width, rect.size.height );
 }


@@ -46,7 +42,7 @@ NSPoint wxToNSPoint( NSView* parent, const wxPoint& p )
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
     int x = p.x ;
     int y = p.y;
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
     int x = p.x ;
     int y = p.y;

-    if ( parent != NULL && ![ parent isFlipped ] )
+    if ( parent == NULL || ![ parent isFlipped ] )

         y = frame.size.height - ( p.y );
     return NSMakePoint(x, y);
 }
         y = frame.size.height - ( p.y );
     return NSMakePoint(x, y);
 }


@@ -56,7 +52,7 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
     int x = p.x;
     int y = p.y;
     NSRect frame = parent ? [parent bounds] : [[NSScreen mainScreen] frame];
     int x = p.x;
     int y = p.y;

-    if ( parent != NULL && ![ parent isFlipped ] )
+    if ( parent == NULL || ![ parent isFlipped ] )

         y = frame.size.height - ( p.y );
     return wxPoint( x, y);
 }
         y = frame.size.height - ( p.y );
     return wxPoint( x, y);
 }


@@ -141,10 +137,26 @@ wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p )
     return NO;
 }
 
     return NO;
 }
 

-- (NSSize)windowWillResize:(NSWindow *)window
+- (NSSize)windowWillResize:(NSWindow *)win

                     toSize:(NSSize)proposedFrameSize
 {
                     toSize:(NSSize)proposedFrameSize
 {

-    // todo
+    NSRect frame = [win frame];
+    wxRect wxframe = wxFromNSRect( NULL, frame );
+    wxframe.SetWidth( proposedFrameSize.width );
+    wxframe.SetHeight( proposedFrameSize.height );
+    wxNSWindow* window = (wxNSWindow*) win;
+    wxNonOwnedWindowCocoaImpl* windowimpl = [window implementation];
+    if ( windowimpl )
+    {
+        wxNonOwnedWindow* wxpeer = windowimpl->GetWXPeer();
+        if ( wxpeer )
+        {
+            wxpeer->HandleResizing( 0, &wxframe );
+            NSSize newSize = NSMakeSize(wxframe.GetWidth(), wxframe.GetHeight());
+            return newSize;
+        }
+    }
+

     return proposedFrameSize;
 }
 
     return proposedFrameSize;
 }
 


@@ -239,7 +251,7 @@ long style, long extraStyle, const wxString& name )
     else
         m_macWindow = [wxNSWindow alloc];
     
     else
         m_macWindow = [wxNSWindow alloc];
     

-    CGWindowLevel level = kCGNormalWindowLevelKey;
+    CGWindowLevel level = kCGNormalWindowLevel;

     
     if ( style & wxFRAME_TOOL_WINDOW )
     {
     
     if ( style & wxFRAME_TOOL_WINDOW )
     {


@@ -414,7 +426,8 @@ bool wxNonOwnedWindowCocoaImpl::CanSetTransparent()
 void wxNonOwnedWindowCocoaImpl::MoveWindow(int x, int y, int width, int height)
 {
     NSRect r = wxToNSRect( NULL, wxRect(x,y,width, height) );
 void wxNonOwnedWindowCocoaImpl::MoveWindow(int x, int y, int width, int height)
 {
     NSRect r = wxToNSRect( NULL, wxRect(x,y,width, height) );

-    [m_macWindow setFrame:r display:YES];
+    // do not trigger refreshes upon invisible and possible partly created objects
+    [m_macWindow setFrame:r display:GetWXPeer()->IsShownOnScreen()];

 }
 
 void wxNonOwnedWindowCocoaImpl::GetPosition( int &x, int &y ) const
 }
 
 void wxNonOwnedWindowCocoaImpl::GetPosition( int &x, int &y ) const


@@ -522,24 +535,23 @@ void wxNonOwnedWindowCocoaImpl::RequestUserAttention(int WXUNUSED(flags))
 void wxNonOwnedWindowCocoaImpl::ScreenToWindow( int *x, int *y )
 {
     wxPoint p((x ? *x : 0), (y ? *y : 0) );
 void wxNonOwnedWindowCocoaImpl::ScreenToWindow( int *x, int *y )
 {
     wxPoint p((x ? *x : 0), (y ? *y : 0) );

-    /*

     NSPoint nspt = wxToNSPoint( NULL, p );
     NSPoint nspt = wxToNSPoint( NULL, p );

-    
-    nspt = [[m_macWindow contentView] convertPoint:p toV:nil];
-    p = wxFromNSPoint( 
-    */
+    nspt = [m_macWindow convertScreenToBase:nspt];
+    nspt = [[m_macWindow contentView] convertPoint:nspt fromView:nil];
+    p = wxFromNSPoint([m_macWindow contentView], nspt);

     if ( x )
     if ( x )

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

     if ( y )
         *y = p.y;
 }
 
 void wxNonOwnedWindowCocoaImpl::WindowToScreen( int *x, int *y )
 {
     if ( y )
         *y = p.y;
 }
 
 void wxNonOwnedWindowCocoaImpl::WindowToScreen( int *x, int *y )
 {

-    wxPoint p(  (x ? *x : 0), (y ? *y : 0) );
-    /*
-    p = [m_macWindow convertPoint:p toWindow:nil];
-    */
+    wxPoint p((x ? *x : 0), (y ? *y : 0) );
+    NSPoint nspt = wxToNSPoint( [m_macWindow contentView], p );
+    nspt = [[m_macWindow contentView] convertPoint:nspt toView:nil];
+    nspt = [m_macWindow convertBaseToScreen:nspt];
+    p = wxFromNSPoint( NULL, nspt);

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


@@ -552,4 +564,4 @@ wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWind
     wxNonOwnedWindowImpl* now = new wxNonOwnedWindowCocoaImpl( wxpeer );
     now->Create( parent, pos, size, style , extraStyle, name );
     return now;
     wxNonOwnedWindowImpl* now = new wxNonOwnedWindowCocoaImpl( wxpeer );
     now->Create( parent, pos, size, style , extraStyle, name );
     return now;

-}
\ No newline at end of file
+}