use wxFSVolume instead of duplicating its functionality in the (MSW branch of) wxGetA...

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

diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm
index f74bbf4a0a25279e26a0724d796c4a2e5af28762..4a3569d81e6dea670c1666c54f80d66d723166ba 100644 (file)
--- a/src/cocoa/frame.mm
+++ b/src/cocoa/frame.mm
@@ -1,19 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/frame.mm
+// Name:        src/cocoa/frame.mm

 // Purpose:     wxFrame
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Purpose:     wxFrame
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

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

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/frame.h"
+

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

-    #include "wx/frame.h"

     #include "wx/menu.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"
     #include "wx/menu.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"


@@ -25,6 +27,7 @@
 #import <AppKit/NSWindow.h>
 #import <AppKit/NSApplication.h>
 #import <AppKit/NSView.h>
 #import <AppKit/NSWindow.h>
 #import <AppKit/NSApplication.h>
 #import <AppKit/NSView.h>

+#import <AppKit/NSMenuItem.h>

 
 // wxFrame
 
 
 // wxFrame
 


@@ -56,16 +59,18 @@ wxFrame::~wxFrame()
     [m_frameNSView release];
 }
 
     [m_frameNSView release];
 }
 

+// -------------------------------------------------------------------
+// Menubar

 void wxFrame::AttachMenuBar(wxMenuBar *mbar)
 {
     wxFrameBase::AttachMenuBar(mbar);
 void wxFrame::AttachMenuBar(wxMenuBar *mbar)
 {
     wxFrameBase::AttachMenuBar(mbar);

-    wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+    wxMenuBarManager::GetInstance()->UpdateMenuBar();

 }
 
 void wxFrame::DetachMenuBar()
 {
     wxFrameBase::DetachMenuBar();
 }
 
 void wxFrame::DetachMenuBar()
 {
     wxFrameBase::DetachMenuBar();

-    wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+    wxMenuBarManager::GetInstance()->UpdateMenuBar();

 }
 
 void wxFrame::SetMenuBar(wxMenuBar *menubar)
 }
 
 void wxFrame::SetMenuBar(wxMenuBar *menubar)


@@ -78,9 +83,55 @@ void wxFrame::SetMenuBar(wxMenuBar *menubar)
 
     wxFrameBase::DetachMenuBar();
     wxFrameBase::AttachMenuBar(menubar);
 
     wxFrameBase::DetachMenuBar();
     wxFrameBase::AttachMenuBar(menubar);

-    wxMenuBarManager::GetInstance()->UpdateWindowMenuBar(this);
+    wxMenuBarManager::GetInstance()->UpdateMenuBar();
+}
+
+wxMenuBar* wxFrame::GetAppMenuBar(wxCocoaNSWindow *win)
+{
+    if(GetMenuBar())
+        return GetMenuBar();
+    return wxFrameBase::GetAppMenuBar(win);
+}
+
+void wxFrame::CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem)
+{
+    wxLogTrace(wxTRACE_COCOA,wxT("wxFrame::wxMenuItemAction"));
+    wxMenuItem *item = wxMenuItem::GetFromCocoa(menuItem);
+    wxCHECK_RET(item,wxT("wxMenuItemAction received but no wxMenuItem exists!"));
+
+    wxMenu *menu = item->GetMenu();
+    wxCHECK_RET(menu,wxT("wxMenuItemAction received but wxMenuItem is not in a wxMenu!"));
+
+    // Since we're handling the delegate messages there's a very good chance
+    // we'll receive a menu action from an item with a nil target.
+    wxMenuBar *menubar = menu->GetMenuBar();
+    if(menubar)
+    {
+        wxFrame *frame = menubar->GetFrame();
+        wxASSERT_MSG(frame==this, wxT("Received wxMenuItemAction in NSWindow delegate from a menu item attached to a different frame."));
+        frame->ProcessCommand(item->GetId());
+    }
+    else
+        wxLogDebug(wxT("Received wxMenuItemAction in NSWindow delegate from an unknown menu item."));
+}
+
+bool wxFrame::CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem)
+{
+    SEL itemAction = [menuItem action];
+    if(itemAction == @selector(wxMenuItemAction:))
+    {
+        wxMenuItem *item = wxMenuItem::GetFromCocoa(menuItem);
+        wxCHECK_MSG(item,false,wxT("validateMenuItem received but no wxMenuItem exists!"));
+        // TODO: do more sanity checking
+        return item->IsEnabled();
+    }
+    // TODO: else if cut/copy/paste
+    wxLogDebug(wxT("Asked to validate an unknown menu item"));
+    return false;

 }
 
 }
 

+// -------------------------------------------------------------------
+// Origin/Size

 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     return wxPoint(0,0);
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     return wxPoint(0,0);


@@ -97,6 +148,7 @@ void wxFrame::CocoaSetWxWindowSize(int width, int height)
     wxTopLevelWindow::CocoaSetWxWindowSize(width,height);
 }
 
     wxTopLevelWindow::CocoaSetWxWindowSize(width,height);
 }
 

+// -------------------------------------------------------------------

 WX_NSView wxFrame::GetNonClientNSView()
 {
     if(m_frameNSView)
 WX_NSView wxFrame::GetNonClientNSView()
 {
     if(m_frameNSView)


@@ -129,8 +181,12 @@ void wxFrame::UpdateFrameNSView()
     if(m_frameToolBar)
     {
         NSView *tbarNSView = m_frameToolBar->GetNSViewForSuperview();
     if(m_frameToolBar)
     {
         NSView *tbarNSView = m_frameToolBar->GetNSViewForSuperview();

+        // If the toolbar doesn't have a superview then set it to our
+        // content view.

         if(![tbarNSView superview])
             [m_frameNSView addSubview: tbarNSView];
         if(![tbarNSView superview])
             [m_frameNSView addSubview: tbarNSView];

+        // Do this after addSubView so that SetSize can work
+        m_frameToolBar->SetSize(m_frameToolBar->DoGetBestSize());

         NSRect tbarRect = [tbarNSView frame];
         tbarRect.size.width = frameRect.size.width;
         tbarRect.origin.x = 0.0;
         NSRect tbarRect = [tbarNSView frame];
         tbarRect.size.width = frameRect.size.width;
         tbarRect.origin.x = 0.0;


@@ -156,7 +212,7 @@ void wxFrame::UpdateFrameNSView()
         [sbarNSView setAutoresizingMask: NSViewWidthSizable|NSViewMaxYMargin];
         sbarheight = sbarRect.size.height;
     }
         [sbarNSView setAutoresizingMask: NSViewWidthSizable|NSViewMaxYMargin];
         sbarheight = sbarRect.size.height;
     }

-    wxLogDebug("frame height=%f, tbar=%f, sbar=%f",frameRect.size.height,tbarheight,sbarheight);
+    wxLogTrace(wxTRACE_COCOA,wxT("frame height=%f, tbar=%f, sbar=%f"),frameRect.size.height,tbarheight,sbarheight);

     NSRect innerRect = [m_cocoaNSView frame];
     innerRect.size.height = frameRect.size.height - tbarheight - sbarheight;
     innerRect.origin.y = sbarheight;
     NSRect innerRect = [m_cocoaNSView frame];
     innerRect.size.height = frameRect.size.height - tbarheight - sbarheight;
     innerRect.origin.y = sbarheight;


@@ -191,6 +247,7 @@ wxStatusBar* wxFrame::CreateStatusBar(int number,
                                           wxWindowID winid,
                                           const wxString& name)
 {
                                           wxWindowID winid,
                                           const wxString& name)
 {

+    wxAutoNSAutoreleasePool pool;

     wxFrameBase::CreateStatusBar(number,style,winid,name);
     if(m_frameStatusBar)
     {
     wxFrameBase::CreateStatusBar(number,style,winid,name);
     if(m_frameStatusBar)
     {


@@ -205,6 +262,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
     if(m_frameToolBar)
     {
 {
     if(m_frameToolBar)
     {

+        m_frameToolBar->SetOwningFrame(NULL);

         [m_frameToolBar->GetNSViewForSuperview() removeFromSuperview];
         [m_frameToolBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin];
         if(m_frameToolBar->GetParent())
         [m_frameToolBar->GetNSViewForSuperview() removeFromSuperview];
         [m_frameToolBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin];
         if(m_frameToolBar->GetParent())


@@ -214,6 +272,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
     if(m_frameToolBar)
     {
         m_frameToolBar->CocoaRemoveFromParent();
     if(m_frameToolBar)
     {
         m_frameToolBar->CocoaRemoveFromParent();

+        m_frameToolBar->SetOwningFrame(this);

     }
     UpdateFrameNSView();
 }
     }
     UpdateFrameNSView();
 }


@@ -222,17 +281,11 @@ wxToolBar* wxFrame::CreateToolBar(long style,
                                       wxWindowID winid,
                                       const wxString& name)
 {
                                       wxWindowID winid,
                                       const wxString& name)
 {

-    wxFrameBase::CreateToolBar(style,winid,name);
-    if(m_frameToolBar)
-    {
-        m_frameToolBar->CocoaRemoveFromParent();
-    }
-    UpdateFrameNSView();
-    return m_frameToolBar;
+    wxAutoNSAutoreleasePool pool;
+    return wxFrameBase::CreateToolBar(style,winid,name);

 }
 #endif // wxUSE_TOOLBAR
 
 void wxFrame::PositionStatusBar()
 {
 }
 }
 #endif // wxUSE_TOOLBAR
 
 void wxFrame::PositionStatusBar()
 {
 }

-