// Created: 2002/12/26
// RCS-ID: $Id:
// Copyright: (c) 2002 David Elliott
-// Licence: wxWindows license
+// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.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
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(wxT("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(wxT("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(wxT("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(wxT("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.
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:
+NS_DURING
+ // This only works on Panther
+// [GetNSView() getRectsBeingDrawn:&rects count:&countRects];
+ // This compiles everywhere (and still only works on Panther)
+ objc_msgSend(GetNSView(),@selector(getRectsBeingDrawn:count:),&rects,&countRects);
+NS_HANDLER
+NS_ENDHANDLER
+ m_updateRegion = wxRegion(rects,countRects);
+
wxPaintEvent event(m_windowId);
event.SetEventObject(this);
bool ret = GetEventHandler()->ProcessEvent(event);
{
wxMouseEvent event(wxEVT_MOTION);
InitMouseEvent(event,theEvent);
- wxLogDebug(wxT("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(wxT("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(wxT("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(wxT("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(wxT("Cocoa_FrameChanged"));
+ wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_FrameChanged"));
wxSizeEvent event(GetSize(), m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
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);
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];
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
*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
// Get size *available for subwindows* i.e. excluding menu bar etc.
void wxWindow::DoGetClientSize(int *x, int *y) const
{
- wxLogDebug(wxT("DoGetClientSize:"));
+ wxLogTrace(wxTRACE_COCOA,wxT("DoGetClientSize:"));
if(m_cocoaScroller)
m_cocoaScroller->DoGetClientSize(x,y);
else
void wxWindow::DoSetClientSize(int width, int height)
{
- wxLogDebug(wxT("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);
projects / wxWidgets.git / blobdiff