// Created: 2002/12/26
// RCS-ID: $Id:
// Copyright: (c) 2002 David Elliott
-// Licence: wxWindows license
+// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#include "wx/log.h"
#include "wx/window.h"
#endif //WX_PRECOMP
+#include "wx/tooltip.h"
#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 <Foundation/NSException.h>
+#import <AppKit/NSApplication.h>
+#import <AppKit/NSWindow.h>
// Turn this on to paint green over the dummy views for debugging
#undef 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
// ========================================================================
};
// ========================================================================
-// wxWindowCocoaScroller
+// wxWindowCocoaScrollView
// ========================================================================
-class wxWindowCocoaScroller: protected wxCocoaNSView
+class wxWindowCocoaScrollView: protected wxCocoaNSView
{
- DECLARE_NO_COPY_CLASS(wxWindowCocoaScroller)
+ DECLARE_NO_COPY_CLASS(wxWindowCocoaScrollView)
public:
- wxWindowCocoaScroller(wxWindow *owner);
- virtual ~wxWindowCocoaScroller();
+ wxWindowCocoaScrollView(wxWindow *owner);
+ virtual ~wxWindowCocoaScrollView();
inline WX_NSScrollView GetNSScrollView() { return m_cocoaNSScrollView; }
void ClientSizeToSize(int &width, int &height);
void DoGetClientSize(int *x, int *y) const;
WX_NSScrollView m_cocoaNSScrollView;
virtual void Cocoa_FrameChanged(void);
private:
- wxWindowCocoaScroller();
+ wxWindowCocoaScrollView();
};
// ========================================================================
[m_owner->GetNSViewForHiding() setFrame:[m_dummyNSView frame]];
}
+
#ifdef WXCOCOA_FILL_DUMMY_VIEW
bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect)
{
@end
// ========================================================================
-// wxWindowCocoaScroller
+// wxWindowCocoaScrollView
// ========================================================================
-wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner)
+wxWindowCocoaScrollView::wxWindowCocoaScrollView(wxWindow *owner)
: m_owner(owner)
{
+ wxAutoNSAutoreleasePool pool;
wxASSERT(owner);
wxASSERT(owner->GetNSView());
m_cocoaNSScrollView = [[NSScrollView alloc]
Encapsulate();
}
-void wxWindowCocoaScroller::Encapsulate()
+void wxWindowCocoaScrollView::Encapsulate()
{
// Set the scroll view autoresizingMask to match the current NSView
[m_cocoaNSScrollView setAutoresizingMask: [m_owner->GetNSView() autoresizingMask]];
// Now it's also retained by the NSScrollView
}
-void wxWindowCocoaScroller::Unencapsulate()
+void wxWindowCocoaScrollView::Unencapsulate()
{
[m_cocoaNSScrollView setDocumentView: nil];
m_owner->CocoaReplaceView(m_cocoaNSScrollView, m_owner->GetNSView());
[m_owner->GetNSView() setAutoresizingMask: NSViewMinYMargin];
}
-wxWindowCocoaScroller::~wxWindowCocoaScroller()
+wxWindowCocoaScrollView::~wxWindowCocoaScrollView()
{
DisassociateNSView(m_cocoaNSScrollView);
[m_cocoaNSScrollView release];
}
-void wxWindowCocoaScroller::ClientSizeToSize(int &width, int &height)
+void wxWindowCocoaScrollView::ClientSizeToSize(int &width, int &height)
{
NSSize frameSize = [NSScrollView
frameSizeForContentSize: NSMakeSize(width,height)
height = (int)frameSize.height;
}
-void wxWindowCocoaScroller::DoGetClientSize(int *x, int *y) const
+void wxWindowCocoaScrollView::DoGetClientSize(int *x, int *y) const
{
NSSize nssize = [m_cocoaNSScrollView contentSize];
if(x)
*y = (int)nssize.height;
}
-void wxWindowCocoaScroller::Cocoa_FrameChanged(void)
+void wxWindowCocoaScrollView::Cocoa_FrameChanged(void)
{
wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_FrameChanged"));
wxSizeEvent event(m_owner->GetSize(), m_owner->GetId());
{
m_cocoaNSView = NULL;
m_cocoaHider = NULL;
- m_cocoaScroller = NULL;
+ m_wxCocoaScrollView = NULL;
m_isBeingDeleted = FALSE;
m_isInPaint = FALSE;
m_shouldBeEnabled = true;
{
m_parent->AddChild(this);
m_parent->CocoaAddChild(this);
+ SetInitialFrameRect(pos,size);
}
- SetInitialFrameRect(pos,size);
return TRUE;
}
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;
+ delete m_wxCocoaScrollView;
+ if(m_cocoaNSView)
+ SendDestroyEvent();
SetNSView(NULL);
}
{
return m_cocoaHider
? m_cocoaHider->GetNSView()
- : m_cocoaScroller
- ? m_cocoaScroller->GetNSScrollView()
+ : m_wxCocoaScrollView
+ ? m_wxCocoaScrollView->GetNSScrollView()
: m_cocoaNSView;
}
WX_NSView wxWindowCocoa::GetNSViewForHiding() const
{
- return m_cocoaScroller
- ? m_cocoaScroller->GetNSScrollView()
+ return m_wxCocoaScrollView
+ ? m_wxCocoaScrollView->GetNSScrollView()
: m_cocoaNSView;
}
wxLogDebug(wxT("Paint event recursion!"));
return false;
}
- //FIXME: should probably turn that rect into the update region
m_isInPaint = TRUE;
+
+ // Set m_updateRegion
+ const NSRect *rects = ▭ // 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);
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
void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- wxLogTrace(wxTRACE_COCOA_Window_Size,"wxWindow=%p::DoSetSizeWindow(%d,%d,%d,%d,Auto: %s%s)",this,x,y,width,height,(sizeFlags&wxSIZE_AUTO_WIDTH)?"W":".",sizeFlags&wxSIZE_AUTO_HEIGHT?"H":".");
+ wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoSetSizeWindow(%d,%d,%d,%d,Auto: %s%s)"),this,x,y,width,height,(sizeFlags&wxSIZE_AUTO_WIDTH)?"W":".",sizeFlags&wxSIZE_AUTO_HEIGHT?"H":".");
int currentX, currentY;
int currentW, currentH;
DoGetPosition(¤tX, ¤tY);
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;
- wxLogTrace(wxTRACE_COCOA_Window_Size,"wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
+ wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)"),this,x,y,width,height);
NSView *nsview = GetNSViewForSuperview();
NSView *superview = [nsview superview];
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];
*w=(int)cocoaRect.size.width;
if(h)
*h=(int)cocoaRect.size.height;
- wxLogTrace(wxTRACE_COCOA_Window_Size,"wxWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
+ wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetSize = (%d,%d)"),this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
}
void wxWindow::DoGetPosition(int *x, int *y) const
*x=(int)cocoaRect.origin.x;
if(y)
*y=(int)(parentRect.size.height-(cocoaRect.origin.y+cocoaRect.size.height));
- wxLogTrace(wxTRACE_COCOA_Window_Size,"wxWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
+ wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
}
WXWidget wxWindow::GetHandle() const
return m_cocoaNSView;
}
+wxWindow* wxWindow::GetWxWindow() const
+{
+ return (wxWindow*) this;
+}
+
void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
{
[m_cocoaNSView setNeedsDisplay:YES];
void wxWindow::SetFocus()
{
- // TODO
+ if([GetNSView() acceptsFirstResponder])
+ [[GetNSView() window] makeFirstResponder: GetNSView()];
}
void wxWindow::DoCaptureMouse()
void wxWindow::DoGetClientSize(int *x, int *y) const
{
wxLogTrace(wxTRACE_COCOA,wxT("DoGetClientSize:"));
- if(m_cocoaScroller)
- m_cocoaScroller->DoGetClientSize(x,y);
+ if(m_wxCocoaScrollView)
+ m_wxCocoaScrollView->DoGetClientSize(x,y);
else
wxWindowCocoa::DoGetSize(x,y);
}
void wxWindow::DoSetClientSize(int width, int height)
{
wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("DoSetClientSize=(%d,%d)"),width,height);
- if(m_cocoaScroller)
- m_cocoaScroller->ClientSizeToSize(width,height);
+ if(m_wxCocoaScrollView)
+ m_wxCocoaScrollView->ClientSizeToSize(width,height);
CocoaSetWxWindowSize(width,height);
}
void wxWindow::CocoaCreateNSScrollView()
{
- if(!m_cocoaScroller)
+ if(!m_wxCocoaScrollView)
{
- m_cocoaScroller = new wxWindowCocoaScroller(this);
+ m_wxCocoaScrollView = new wxWindowCocoaScrollView(this);
}
}
}
// Get the window with the focus
-wxWindow *wxWindowBase::FindFocus()
+wxWindow *wxWindowBase::DoFindFocus()
{
- // TODO
+ // Basically we are somewhat emulating the responder chain here except
+ // we are only loking for the first responder in the key window or
+ // upon failing to find one if the main window is different we look
+ // for the first responder in the main window.
+
+ // Note that the firstResponder doesn't necessarily have to be an
+ // NSView but wxCocoaNSView::GetFromCocoa() will simply return
+ // NULL unless it finds its argument in its hash map.
+
+ wxCocoaNSView *win;
+
+ NSWindow *keyWindow = [[NSApplication sharedApplication] keyWindow];
+ win = wxCocoaNSView::GetFromCocoa([keyWindow firstResponder]);
+ if(win)
+ return win->GetWxWindow();
+
+ NSWindow *mainWindow = [[NSApplication sharedApplication] keyWindow];
+ if(mainWindow == keyWindow)
+ return NULL;
+ win = wxCocoaNSView::GetFromCocoa([mainWindow firstResponder]);
+ if(win)
+ return win->GetWxWindow();
+
return NULL;
}
projects / wxWidgets.git / blobdiff