removed src/gtk/eggtrayicon.h

[wxWidgets.git] / src / cocoa / window.mm

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 0259aa8de3dd83a7b98dfd162518b80df17798f2..417301f392156fc72760584676797c94ae60594f 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -6,22 +6,27 @@
 // Created:     2002/12/26
 // RCS-ID:      $Id:
 // Copyright:   (c) 2002 David Elliott
 // Created:     2002/12/26
 // RCS-ID:      $Id:
 // Copyright:   (c) 2002 David Elliott

-// Licence:    wxWindows license
+// Licence:    wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/tooltip.h"

     #include "wx/window.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
     #include "wx/window.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"

+#include "wx/cocoa/string.h"

 
 #import <AppKit/NSView.h>
 #import <AppKit/NSEvent.h>
 #import <AppKit/NSScrollView.h>
 #import <AppKit/NSColor.h>
 #import <AppKit/NSClipView.h>
 
 #import <AppKit/NSView.h>
 #import <AppKit/NSEvent.h>
 #import <AppKit/NSScrollView.h>
 #import <AppKit/NSColor.h>
 #import <AppKit/NSClipView.h>

+#import <Foundation/NSException.h>
+
+#include <objc/objc-runtime.h>

 
 // Turn this on to paint green over the dummy views for debugging
 #undef WXCOCOA_FILL_DUMMY_VIEW
 
 // Turn this on to paint green over the dummy views for debugging
 #undef WXCOCOA_FILL_DUMMY_VIEW


@@ -30,6 +35,11 @@
 #import <AppKit/NSBezierPath.h>
 #endif //def WXCOCOA_FILL_DUMMY_VIEW
 
 #import <AppKit/NSBezierPath.h>
 #endif //def WXCOCOA_FILL_DUMMY_VIEW
 

+// A category for methods that are only present in Panther's SDK
+@interface NSView(wxNSViewPrePantherCompatibility)
+- (void)getRectsBeingDrawn:(const NSRect **)rects count:(int *)count;
+@end
+

 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================
 // ========================================================================
 // wxWindowCocoaHider
 // ========================================================================


@@ -115,6 +125,7 @@ void wxWindowCocoaHider::Cocoa_FrameChanged(void)
     [m_owner->GetNSViewForHiding() setFrame:[m_dummyNSView frame]];
 }
 
     [m_owner->GetNSViewForHiding() setFrame:[m_dummyNSView frame]];
 }
 

+

 #ifdef WXCOCOA_FILL_DUMMY_VIEW
 bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect)
 {
 #ifdef WXCOCOA_FILL_DUMMY_VIEW
 bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect)
 {


@@ -147,6 +158,7 @@ bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect)
 wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner)
 :   m_owner(owner)
 {
 wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner)
 :   m_owner(owner)
 {

+    wxAutoNSAutoreleasePool pool;

     wxASSERT(owner);
     wxASSERT(owner->GetNSView());
     m_cocoaNSScrollView = [[NSScrollView alloc]
     wxASSERT(owner);
     wxASSERT(owner->GetNSView());
     m_cocoaNSScrollView = [[NSScrollView alloc]


@@ -279,12 +291,14 @@ wxWindow::~wxWindow()
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
 
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
 

-    // Make sure our parent (in the wxWindows sense) is our superview
+    // Make sure our parent (in the wxWidgets sense) is our superview

     // before we go removing from it.
     if(m_parent && m_parent->GetNSView()==[GetNSViewForSuperview() superview])
         CocoaRemoveFromParent();
     delete m_cocoaHider;
     delete m_cocoaScroller;
     // before we go removing from it.
     if(m_parent && m_parent->GetNSView()==[GetNSViewForSuperview() superview])
         CocoaRemoveFromParent();
     delete m_cocoaHider;
     delete m_cocoaScroller;

+    if(m_cocoaNSView)
+        SendDestroyEvent();

     SetNSView(NULL);
 }
 
     SetNSView(NULL);
 }
 


@@ -304,10 +318,6 @@ void wxWindowCocoa::CocoaRemoveFromParent(void)
 
 void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)
 {
 
 void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)
 {

-    // Assume setting the NSView to NULL means this wxWindow is being destroyed
-    if(m_cocoaNSView && !cocoaNSView)
-        SendDestroyEvent();
-

     bool need_debug = cocoaNSView || m_cocoaNSView;
     if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxWindowCocoa=%p::SetNSView [m_cocoaNSView=%p retainCount]=%d"),this,m_cocoaNSView,[m_cocoaNSView retainCount]);
     DisassociateNSView(m_cocoaNSView);
     bool need_debug = cocoaNSView || m_cocoaNSView;
     if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxWindowCocoa=%p::SetNSView [m_cocoaNSView=%p retainCount]=%d"),this,m_cocoaNSView,[m_cocoaNSView retainCount]);
     DisassociateNSView(m_cocoaNSView);


@@ -345,8 +355,16 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
         wxLogDebug(wxT("Paint event recursion!"));
         return false;
     }
         wxLogDebug(wxT("Paint event recursion!"));
         return false;
     }

-    //FIXME: should probably turn that rect into the update region

     m_isInPaint = TRUE;
     m_isInPaint = TRUE;

+
+    // Set m_updateRegion
+    const NSRect *rects = &rect; // The bounding box of the region
+    int countRects = 1;
+    // Try replacing the larger rectangle with a list of smaller ones:
+    if ([GetNSView() respondsToSelector:@selector(getRectsBeingDrawn:count:)])
+        [GetNSView() getRectsBeingDrawn:&rects count:&countRects];
+    m_updateRegion = wxRegion(rects,countRects);
+

     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     bool ret = GetEventHandler()->ProcessEvent(event);
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
     bool ret = GetEventHandler()->ProcessEvent(event);


@@ -464,6 +482,16 @@ void wxWindowCocoa::Cocoa_FrameChanged(void)
     GetEventHandler()->ProcessEvent(event);
 }
 
     GetEventHandler()->ProcessEvent(event);
 }
 

+bool wxWindowCocoa::Cocoa_resetCursorRects()
+{
+    if(!m_cursor.GetNSCursor())
+        return false;
+    
+    [GetNSView() addCursorRect: [GetNSView() visibleRect]  cursor: m_cursor.GetNSCursor()];    
+        
+    return true;
+}
+

 bool wxWindow::Close(bool force)
 {
     // The only reason this function exists is that it is virtual and
 bool wxWindow::Close(bool force)
 {
     // The only reason this function exists is that it is virtual and


@@ -583,6 +611,20 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
     DoMoveWindow(x,y,width,height);
 }
 
     DoMoveWindow(x,y,width,height);
 }
 

+#if wxUSE_TOOLTIPS
+
+void wxWindowCocoa::DoSetToolTip( wxToolTip *tip )
+{
+    wxWindowBase::DoSetToolTip(tip);
+
+    if ( m_tooltip )
+    {
+        m_tooltip->SetWindow((wxWindow *)this);
+    }
+}
+
+#endif
+

 void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
     wxAutoNSAutoreleasePool pool;
 void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
     wxAutoNSAutoreleasePool pool;


@@ -614,7 +656,7 @@ void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size)
     frameRect.origin.y = parentRect.size.height-(pos.y+frameRect.size.height);
     // Tell Cocoa to change the margin between the bottom of the superview
     // and the bottom of the control.  Keeps the control pinned to the top
     frameRect.origin.y = parentRect.size.height-(pos.y+frameRect.size.height);
     // Tell Cocoa to change the margin between the bottom of the superview
     // and the bottom of the control.  Keeps the control pinned to the top

-    // of its superview so that its position in the wxWindows coordinate
+    // of its superview so that its position in the wxWidgets coordinate

     // system doesn't change.
     if(![superview isFlipped])
         [nsview setAutoresizingMask: NSViewMinYMargin];
     // system doesn't change.
     if(![superview isFlipped])
         [nsview setAutoresizingMask: NSViewMinYMargin];


@@ -654,6 +696,11 @@ WXWidget wxWindow::GetHandle() const
     return m_cocoaNSView;
 }
 
     return m_cocoaNSView;
 }
 

+wxWindow* wxWindow::GetWxWindow() const
+{
+    return (wxWindow*) this;
+}
+

 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
     [m_cocoaNSView setNeedsDisplay:YES];
 void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
     [m_cocoaNSView setNeedsDisplay:YES];


@@ -661,7 +708,14 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 
 void wxWindow::SetFocus()
 {
 
 void wxWindow::SetFocus()
 {

-    // TODO
+#ifdef __WXDEBUG__
+    bool bOK = 
+#endif
+        [GetNSView() lockFocusIfCanDraw];
+        
+    //Note that the normal lockFocus works on hidden and minimized windows
+    //and has no return value - which probably isn't what we want
+    wxASSERT(bOK);

 }
 
 void wxWindow::DoCaptureMouse()
 }
 
 void wxWindow::DoCaptureMouse()


@@ -840,10 +894,14 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 }
 
 // Get the window with the focus
 }
 
 // Get the window with the focus

-wxWindow *wxWindowBase::FindFocus()
-{
-    // TODO
-    return NULL;
+wxWindow *wxWindowBase::DoFindFocus()
+{
+    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa([NSView focusView]);
+    
+    if (!win)
+        return NULL;
+        
+    return win->GetWxWindow();

 }
 
 /* static */ wxWindow *wxWindowBase::GetCapture()
 }
 
 /* static */ wxWindow *wxWindowBase::GetCapture()