// 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>
// 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
// ========================================================================
[m_owner->GetNSViewForHiding() setFrame:[m_dummyNSView frame]];
}
+
#ifdef WXCOCOA_FILL_DUMMY_VIEW
bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect)
{
wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner)
: m_owner(owner)
{
+ wxAutoNSAutoreleasePool pool;
wxASSERT(owner);
wxASSERT(owner->GetNSView());
m_cocoaNSScrollView = [[NSScrollView alloc]
hasHorizontalScroller: [m_cocoaNSScrollView hasHorizontalScroller]
hasVerticalScroller: [m_cocoaNSScrollView hasVerticalScroller]
borderType: [m_cocoaNSScrollView borderType]];
- width = frameSize.width;
- height = frameSize.height;
+ width = (int)frameSize.width;
+ height = (int)frameSize.height;
}
void wxWindowCocoaScroller::DoGetClientSize(int *x, int *y) const
{
NSSize nssize = [m_cocoaNSScrollView contentSize];
if(x)
- *x = nssize.width;
+ *x = (int)nssize.width;
if(y)
- *y = nssize.height;
+ *y = (int)nssize.height;
}
void wxWindowCocoaScroller::Cocoa_FrameChanged(void)
{
- wxLogDebug("Cocoa_FrameChanged");
+ wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_FrameChanged"));
wxSizeEvent event(m_owner->GetSize(), m_owner->GetId());
event.SetEventObject(m_owner);
m_owner->GetEventHandler()->ProcessEvent(event);
{
m_parent->AddChild(this);
m_parent->CocoaAddChild(this);
+ SetInitialFrameRect(pos,size);
}
- SetInitialFrameRect(pos,size);
return TRUE;
}
wxAutoNSAutoreleasePool pool;
DestroyChildren();
- CocoaRemoveFromParent();
+ // 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;
+ if(m_cocoaNSView)
+ SendDestroyEvent();
SetNSView(NULL);
}
void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)
{
bool need_debug = cocoaNSView || m_cocoaNSView;
- if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [m_cocoaNSView=%p retainCount]=%d",this,m_cocoaNSView,[m_cocoaNSView retainCount]);
+ 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);
[cocoaNSView retain];
[m_cocoaNSView release];
m_cocoaNSView = cocoaNSView;
AssociateNSView(m_cocoaNSView);
- if(need_debug) wxLogDebug("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d",this,cocoaNSView,[cocoaNSView retainCount]);
+ if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxWindowCocoa=%p::SetNSView [cocoaNSView=%p retainCount]=%d"),this,cocoaNSView,[cocoaNSView retainCount]);
}
WX_NSView wxWindowCocoa::GetNSViewForSuperview() const
bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
{
- wxLogDebug("Cocoa_drawRect");
+ wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_drawRect"));
// Recursion can happen if the event loop runs from within the paint
// handler. For instance, if an assertion dialog is shown.
// FIXME: This seems less than ideal.
if(m_isInPaint)
{
- wxLogDebug("Paint event recursion!");
+ 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);
void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent)
{
- wxASSERT_MSG([m_cocoaNSView window]==[cocoaEvent window],"Mouse event for different NSWindow");
+ wxASSERT_MSG([m_cocoaNSView window]==[cocoaEvent window],wxT("Mouse event for different NSWindow"));
NSPoint cocoaPoint = [m_cocoaNSView convertPoint:[(NSEvent*)cocoaEvent locationInWindow] fromView:nil];
NSRect cocoaRect = [m_cocoaNSView frame];
const wxPoint &clientorigin = GetClientAreaOrigin();
{
wxMouseEvent event(wxEVT_MOTION);
InitMouseEvent(event,theEvent);
- wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y);
+ wxLogTrace(wxTRACE_COCOA,wxT("Mouse Drag @%d,%d"),event.m_x,event.m_y);
return GetEventHandler()->ProcessEvent(event);
}
{
wxMouseEvent event([theEvent clickCount]<2?wxEVT_LEFT_DOWN:wxEVT_LEFT_DCLICK);
InitMouseEvent(event,theEvent);
- wxLogDebug("Mouse Down @%d,%d num clicks=%d",event.m_x,event.m_y,[theEvent clickCount]);
+ wxLogTrace(wxTRACE_COCOA,wxT("Mouse Down @%d,%d num clicks=%d"),event.m_x,event.m_y,[theEvent clickCount]);
return GetEventHandler()->ProcessEvent(event);
}
wxMouseEvent event(wxEVT_MOTION);
InitMouseEvent(event,theEvent);
event.m_leftDown = true;
- wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y);
+ wxLogTrace(wxTRACE_COCOA,wxT("Mouse Drag @%d,%d"),event.m_x,event.m_y);
return GetEventHandler()->ProcessEvent(event);
}
{
wxMouseEvent event(wxEVT_LEFT_UP);
InitMouseEvent(event,theEvent);
- wxLogDebug("Mouse Up @%d,%d",event.m_x,event.m_y);
+ wxLogTrace(wxTRACE_COCOA,wxT("Mouse Up @%d,%d"),event.m_x,event.m_y);
return GetEventHandler()->ProcessEvent(event);
}
bool wxWindowCocoa::Cocoa_rightMouseDown(WX_NSEvent theEvent)
{
- return false;
+ wxMouseEvent event([theEvent clickCount]<2?wxEVT_RIGHT_DOWN:wxEVT_RIGHT_DCLICK);
+ InitMouseEvent(event,theEvent);
+ wxLogDebug(wxT("Mouse Down @%d,%d num clicks=%d"),event.m_x,event.m_y,[theEvent clickCount]);
+ return GetEventHandler()->ProcessEvent(event);
}
bool wxWindowCocoa::Cocoa_rightMouseDragged(WX_NSEvent theEvent)
{
- return false;
+ wxMouseEvent event(wxEVT_MOTION);
+ InitMouseEvent(event,theEvent);
+ event.m_rightDown = true;
+ wxLogDebug(wxT("Mouse Drag @%d,%d"),event.m_x,event.m_y);
+ return GetEventHandler()->ProcessEvent(event);
}
bool wxWindowCocoa::Cocoa_rightMouseUp(WX_NSEvent theEvent)
{
- return false;
+ wxMouseEvent event(wxEVT_RIGHT_UP);
+ InitMouseEvent(event,theEvent);
+ wxLogDebug(wxT("Mouse Up @%d,%d"),event.m_x,event.m_y);
+ return GetEventHandler()->ProcessEvent(event);
}
bool wxWindowCocoa::Cocoa_otherMouseDown(WX_NSEvent theEvent)
void wxWindowCocoa::Cocoa_FrameChanged(void)
{
- wxLogDebug("Cocoa_FrameChanged");
+ wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_FrameChanged"));
wxSizeEvent event(GetSize(), m_windowId);
event.SetEventObject(this);
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
// If the window is marked as visible, then it shouldn't have a dummy view
// If the window is marked hidden, then it should have a dummy view
// wxSpinCtrl (generic) abuses m_isShown, don't use it for any logic
-// wxASSERT_MSG( (m_isShown && !m_dummyNSView) || (!m_isShown && m_dummyNSView),"wxWindow: m_isShown does not agree with m_dummyNSView");
+// wxASSERT_MSG( (m_isShown && !m_dummyNSView) || (!m_isShown && m_dummyNSView),wxT("wxWindow: m_isShown does not agree with m_dummyNSView"));
// Return false if there isn't a window to show or hide
NSView *cocoaView = GetNSViewForHiding();
if(!cocoaView)
void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
-// wxLogDebug("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;
-// wxLogDebug("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];
- wxCHECK_RET(superview,"NSView does not have a superview");
+ wxCHECK_RET(superview,wxT("NSView does not have a superview"));
NSRect parentRect = [superview bounds];
NSRect cocoaRect = NSMakeRect(x,parentRect.size.height-(y+height),width,height);
{
NSView *nsview = GetNSViewForSuperview();
NSView *superview = [nsview superview];
- wxCHECK_RET(superview,"NSView does not have a superview");
+ wxCHECK_RET(superview,wxT("NSView does not have a superview"));
NSRect parentRect = [superview bounds];
NSRect frameRect = [nsview frame];
if(size.x!=-1)
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;
-// wxLogDebug("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
{
NSView *nsview = GetNSViewForSuperview();
NSView *superview = [nsview superview];
- wxCHECK_RET(superview,"NSView does not have a superview");
+ wxCHECK_RET(superview,wxT("NSView does not have a superview"));
NSRect parentRect = [superview bounds];
NSRect cocoaRect = [nsview frame];
*x=(int)cocoaRect.origin.x;
if(y)
*y=(int)(parentRect.size.height-(cocoaRect.origin.y+cocoaRect.size.height));
-// wxLogDebug("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
+#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()
// Get size *available for subwindows* i.e. excluding menu bar etc.
void wxWindow::DoGetClientSize(int *x, int *y) const
{
- wxLogDebug("DoGetClientSize:");
+ wxLogTrace(wxTRACE_COCOA,wxT("DoGetClientSize:"));
if(m_cocoaScroller)
m_cocoaScroller->DoGetClientSize(x,y);
else
void wxWindow::DoSetClientSize(int width, int height)
{
- wxLogDebug("DoSetClientSize=(%d,%d)",width,height);
+ wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("DoSetClientSize=(%d,%d)"),width,height);
if(m_cocoaScroller)
m_cocoaScroller->ClientSizeToSize(width,height);
CocoaSetWxWindowSize(width,height);
}
// 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()
projects / wxWidgets.git / blobdiff