include "wx/toolbar.h" instead of tbar(base|smpl).h

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

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 31c729fcca4e6c8022e04a88ade01b47157011fa..5666a121ac7248632928f2b9b91f387f39823552 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -13,6 +13,7 @@
 #include "wx/log.h"
 
 #import <Appkit/NSView.h>
+#import <AppKit/NSEvent.h>
 
 // normally the base classes aren't included, but wxWindow is special
 #ifdef __WXUNIVERSAL__
@@ -32,6 +33,7 @@ void wxWindowCocoa::Init()
     m_cocoaNSView = NULL;
     m_dummyNSView = NULL;
     m_isBeingDeleted = FALSE;
+    m_isInPaint = FALSE;
 }
 
 // Constructor
@@ -119,12 +121,116 @@ void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)
 bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
 {
     wxLogDebug("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!");
+        return false;
+    }
     //FIXME: should probably turn that rect into the update region
+    m_isInPaint = TRUE;
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
+    bool ret = GetEventHandler()->ProcessEvent(event);
+    m_isInPaint = FALSE;
+    return ret;
+}
+
+void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent)
+{
+    NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView;
+    wxASSERT_MSG([nsview window]==[cocoaEvent window],"Mouse event for different NSWindow");
+    NSPoint cocoaPoint = [nsview convertPoint:[(NSEvent*)cocoaEvent locationInWindow] fromView:nil];
+    NSRect cocoaRect = [nsview frame];
+    const wxPoint &clientorigin = GetClientAreaOrigin();
+    event.m_x = (wxCoord)cocoaPoint.x - clientorigin.x;
+    event.m_y = (wxCoord)(cocoaRect.size.height - cocoaPoint.y) - clientorigin.y;
+
+    event.m_shiftDown = [cocoaEvent modifierFlags] & NSShiftKeyMask;
+    event.m_controlDown = [cocoaEvent modifierFlags] & NSControlKeyMask;
+    event.m_altDown = [cocoaEvent modifierFlags] & NSAlternateKeyMask;
+    event.m_metaDown = [cocoaEvent modifierFlags] & NSCommandKeyMask;
+
+    // TODO: set timestamp?
+    event.SetEventObject(this);
+    event.SetId(GetId());
+}
+
+bool wxWindowCocoa::Cocoa_mouseMoved(WX_NSEvent theEvent)
+{
+    wxMouseEvent event(wxEVT_MOTION);
+    InitMouseEvent(event,theEvent);
+    wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y);
     return GetEventHandler()->ProcessEvent(event);
 }
 
+bool wxWindowCocoa::Cocoa_mouseEntered(WX_NSEvent theEvent)
+{
+    return false;
+}
+
+bool wxWindowCocoa::Cocoa_mouseExited(WX_NSEvent theEvent)
+{
+    return false;
+}
+
+bool wxWindowCocoa::Cocoa_mouseDown(WX_NSEvent theEvent)
+{
+    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]);
+    return GetEventHandler()->ProcessEvent(event);
+}
+
+bool wxWindowCocoa::Cocoa_mouseDragged(WX_NSEvent theEvent)
+{
+    wxMouseEvent event(wxEVT_MOTION);
+    InitMouseEvent(event,theEvent);
+    event.m_leftDown = true;
+    wxLogDebug("Mouse Drag @%d,%d",event.m_x,event.m_y);
+    return GetEventHandler()->ProcessEvent(event);
+}
+
+bool wxWindowCocoa::Cocoa_mouseUp(WX_NSEvent theEvent)
+{
+    wxMouseEvent event(wxEVT_LEFT_UP);
+    InitMouseEvent(event,theEvent);
+    wxLogDebug("Mouse Up @%d,%d",event.m_x,event.m_y);
+    return GetEventHandler()->ProcessEvent(event);
+}
+
+bool wxWindowCocoa::Cocoa_rightMouseDown(WX_NSEvent theEvent)
+{
+    return false;
+}
+
+bool wxWindowCocoa::Cocoa_rightMouseDragged(WX_NSEvent theEvent)
+{
+    return false;
+}
+
+bool wxWindowCocoa::Cocoa_rightMouseUp(WX_NSEvent theEvent)
+{
+    return false;
+}
+
+bool wxWindowCocoa::Cocoa_otherMouseDown(WX_NSEvent theEvent)
+{
+    return false;
+}
+
+bool wxWindowCocoa::Cocoa_otherMouseDragged(WX_NSEvent theEvent)
+{
+    return false;
+}
+
+bool wxWindowCocoa::Cocoa_otherMouseUp(WX_NSEvent theEvent)
+{
+    return false;
+}
+
 void wxWindowCocoa::Cocoa_FrameChanged(void)
 {
     wxLogDebug("Cocoa_FrameChanged");
@@ -155,8 +261,10 @@ bool wxWindow::Show(bool show)
         [m_cocoaNSView retain];
         [[m_dummyNSView superview] replaceSubview:m_dummyNSView with:m_cocoaNSView];
         // But since we also retained it ourselves
+        wxASSERT(![m_dummyNSView superview]);
         [m_dummyNSView release];
         m_dummyNSView = nil;
+        wxASSERT([m_cocoaNSView superview]);
     }
     else
     {
@@ -165,6 +273,8 @@ bool wxWindow::Show(bool show)
         // NOTE: replaceSubView will cause m_cocaNSView to be released
         [[m_cocoaNSView superview] replaceSubview:m_cocoaNSView with:m_dummyNSView];
         // m_coocaNSView is now only retained by us
+        wxASSERT([m_dummyNSView superview]);
+        wxASSERT(![m_cocoaNSView superview]);
     }
     m_isShown = show;
     return true;
@@ -172,7 +282,7 @@ bool wxWindow::Show(bool show)
 
 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":".");
+//    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":".");
     int currentX, currentY;
     int currentW, currentH;
     DoGetPosition(&currentX, &currentY);
@@ -212,7 +322,7 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
 
 void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
-    wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
+//    wxLogDebug("wxWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
 
     NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView;
     NSView *superview = [nsview superview];
@@ -234,7 +344,7 @@ void wxWindow::DoGetSize(int *w, int *h) const
         *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);
+//    wxLogDebug("wxWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
 }
 
 void wxWindow::DoGetPosition(int *x, int *y) const
@@ -249,7 +359,7 @@ 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);
+//    wxLogDebug("wxWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
 }
 
 WXWidget wxWindow::GetHandle() const
@@ -257,6 +367,11 @@ WXWidget wxWindow::GetHandle() const
     return m_cocoaNSView;
 }
 
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
+{
+    [m_cocoaNSView setNeedsDisplay:YES];
+}
+
 void wxWindow::SetFocus()
 {
     // TODO
@@ -314,11 +429,6 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     // TODO
 }
 
-void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
-{
-    // TODO
-}
-
 // Coordinates relative to the window
 void wxWindow::WarpPointer (int x_pos, int y_pos)
 {
@@ -377,7 +487,11 @@ void wxWindow::Clear()
 // Raise the window to the top of the Z order
 void wxWindow::Raise()
 {
-    // TODO
+    NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView;
+    NSView *superview = [nsview superview];
+    [nsview retain];
+    [nsview removeFromSuperview];
+    [superview addSubview:nsview];
 }
 
 // Lower the window to the bottom of the Z order