Make status bar grip move to the left in RTL.

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

diff --git a/src/cocoa/toplevel.mm b/src/cocoa/toplevel.mm
index 453ad124a36492674b46bf598604d5491fab5e50..842251756bbb115b65e458decc623c2a738b1ac0 100644 (file)
--- a/src/cocoa/toplevel.mm
+++ b/src/cocoa/toplevel.mm
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     implements wxTopLevelWindow for Cocoa
 // Purpose:     implements wxTopLevelWindow for Cocoa

-// Author:      David Elliott 
+// Author:      David Elliott

 // Modified by:
 // Created:     2002/11/27
 // Modified by:
 // Created:     2002/11/27

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

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

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

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -19,9 +19,11 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

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

 #ifndef WX_PRECOMP
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/window.h"

-    #include "wx/toplevel.h"

     #include "wx/menuitem.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/menuitem.h"
     #include "wx/frame.h"
     #include "wx/log.h"


@@ -30,7 +32,6 @@
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"

-#include "wx/cocoa/mbarman.h"

 
 #import <AppKit/NSView.h>
 #import <AppKit/NSWindow.h>
 
 #import <AppKit/NSView.h>
 #import <AppKit/NSWindow.h>


@@ -46,6 +47,8 @@ wxWindowList       wxModelessWindows;
 // wxTopLevelWindowCocoa implementation
 // ============================================================================
 
 // wxTopLevelWindowCocoa implementation
 // ============================================================================
 

+wxTopLevelWindowCocoa *wxTopLevelWindowCocoa::sm_cocoaDeactivateWindow = NULL;
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa creation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa creation
 // ----------------------------------------------------------------------------


@@ -92,7 +95,7 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
     wxTopLevelWindows.Append(this);
 
     if(!CreateBase(parent,winid,pos,size,style,wxDefaultValidator,name))
     wxTopLevelWindows.Append(this);
 
     if(!CreateBase(parent,winid,pos,size,style,wxDefaultValidator,name))

-        return FALSE;
+        return false;

 
     if ( parent )
         parent->AddChild(this);
 
     if ( parent )
         parent->AddChild(this);


@@ -101,8 +104,30 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
     if(style & wxFRAME_TOOL_WINDOW)
         cocoaStyle |= NSUtilityWindowMask;
 
     if(style & wxFRAME_TOOL_WINDOW)
         cocoaStyle |= NSUtilityWindowMask;
 

+    // Create frame and check and handle default position and size
+    int realx,
+        realy;
+
+    // WX has no set default position - the carbon port caps the low
+    // end at 20, 50.  Here we do the same, except instead of setting
+    // it to 20 and 50, we set it to 100 and 100 if the values are too low
+    if (pos.x < 20)
+        realx = 100;
+    else
+        realx = pos.x;
+
+    if (pos.y < 50)
+        realy = 100;
+    else
+        realy = pos.y;
+
+    int realw = WidthDefault(size.x);
+    int realh = HeightDefault(size.y);
+

     // NOTE: y-origin needs to be flipped.
     // NOTE: y-origin needs to be flipped.

-    NSRect cocoaRect = [NSWindow contentRectForFrameRect:NSMakeRect(pos.x,pos.y,size.x,size.y) styleMask:cocoaStyle];
+    NSRect cocoaRect = [NSWindow
+                        contentRectForFrameRect:NSMakeRect(realx,realy,realw,realh)
+                        styleMask:cocoaStyle];

 
     m_cocoaNSWindow = NULL;
     m_cocoaNSView = NULL;
 
     m_cocoaNSWindow = NULL;
     m_cocoaNSView = NULL;


@@ -120,24 +145,45 @@ bool wxTopLevelWindowCocoa::Create(wxWindow *parent,
     if(style & wxSTAY_ON_TOP)
         [m_cocoaNSWindow setLevel:NSFloatingWindowLevel];
     [m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];
     if(style & wxSTAY_ON_TOP)
         [m_cocoaNSWindow setLevel:NSFloatingWindowLevel];
     [m_cocoaNSWindow setTitle:wxNSStringWithWxString(title)];

-    return TRUE;
+    return true;

 }
 
 wxTopLevelWindowCocoa::~wxTopLevelWindowCocoa()
 {
 }
 
 wxTopLevelWindowCocoa::~wxTopLevelWindowCocoa()
 {

+    wxASSERT(sm_cocoaDeactivateWindow!=this);

     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();

+    if(m_cocoaNSView)
+        SendDestroyEvent();

     SetNSWindow(NULL);
 }
 
     SetNSWindow(NULL);
 }
 

+bool wxTopLevelWindowCocoa::Destroy()
+{
+    if(sm_cocoaDeactivateWindow==this)
+    {
+        sm_cocoaDeactivateWindow = NULL;
+        wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey();
+    }
+    return wxTopLevelWindowBase::Destroy();
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa Cocoa Specifics
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa Cocoa Specifics
 // ----------------------------------------------------------------------------
 

+wxMenuBar* wxTopLevelWindowCocoa::GetAppMenuBar(wxCocoaNSWindow *win)
+{
+    wxTopLevelWindowCocoa *parent = wxDynamicCast(GetParent(),wxTopLevelWindow);
+    if(parent)
+        return parent->GetAppMenuBar(win);
+    return NULL;
+}
+

 void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
 {
     bool need_debug = cocoaNSWindow || m_cocoaNSWindow;
 void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
 {
     bool need_debug = cocoaNSWindow || m_cocoaNSWindow;

-    if(need_debug) wxLogDebug("wxTopLevelWindowCocoa=%p::SetNSWindow [m_cocoaNSWindow=%p retainCount]=%d",this,m_cocoaNSWindow,[m_cocoaNSWindow retainCount]);
+    if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxTopLevelWindowCocoa=%p::SetNSWindow [m_cocoaNSWindow=%p retainCount]=%d"),this,m_cocoaNSWindow,[m_cocoaNSWindow retainCount]);

     DisassociateNSWindow(m_cocoaNSWindow);
     [cocoaNSWindow retain];
     [m_cocoaNSWindow release];
     DisassociateNSWindow(m_cocoaNSWindow);
     [cocoaNSWindow retain];
     [m_cocoaNSWindow release];


@@ -147,7 +193,7 @@ void wxTopLevelWindowCocoa::SetNSWindow(WX_NSWindow cocoaNSWindow)
     else
         SetNSView(NULL);
     AssociateNSWindow(m_cocoaNSWindow);
     else
         SetNSView(NULL);
     AssociateNSWindow(m_cocoaNSWindow);

-    if(need_debug) wxLogDebug("wxTopLevelWindowCocoa=%p::SetNSWindow [cocoaNSWindow=%p retainCount]=%d",this,cocoaNSWindow,[cocoaNSWindow retainCount]);
+    if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxTopLevelWindowCocoa=%p::SetNSWindow [cocoaNSWindow=%p retainCount]=%d"),this,cocoaNSWindow,[cocoaNSWindow retainCount]);

 }
 
 void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
 }
 
 void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)


@@ -156,44 +202,44 @@ void wxTopLevelWindowCocoa::CocoaReplaceView(WX_NSView oldView, WX_NSView newVie
         [m_cocoaNSWindow setContentView:newView];
 }
 
         [m_cocoaNSWindow setContentView:newView];
 }
 

+/*static*/ void wxTopLevelWindowCocoa::DeactivatePendingWindow()
+{
+    if(sm_cocoaDeactivateWindow)
+        sm_cocoaDeactivateWindow->wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey();
+    sm_cocoaDeactivateWindow = NULL;
+}
+

 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
 {
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeKey(void)
 {

-    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey",this);
-    wxMenuBarManager::GetInstance()->WindowDidBecomeKey(this);
-    wxActivateEvent event(wxEVT_ACTIVATE, TRUE, GetId());
+    DeactivatePendingWindow();
+    wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeKey"),this);
+    wxActivateEvent event(wxEVT_ACTIVATE, true, GetId());

     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
 {
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignKey(void)
 {

-    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey",this);
-    wxActivateEvent event(wxEVT_ACTIVATE, FALSE, GetId());
+    wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignKey"),this);
+    wxActivateEvent event(wxEVT_ACTIVATE, false, GetId());

     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);
     event.SetEventObject(this);
     GetEventHandler()->ProcessEvent(event);

-    wxMenuBarManager::GetInstance()->WindowDidResignKey(this);

 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)
 {
 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidBecomeMain(void)
 {

-    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain",this);
-    wxMenuBarManager::GetInstance()->WindowDidBecomeMain(this);
+    wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidBecomeMain"),this);

 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignMain(void)
 {
 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowDidResignMain(void)
 {

-    wxLogDebug("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain",this);
-    wxMenuBarManager::GetInstance()->WindowDidResignMain(this);
+    wxLogTrace(wxTRACE_COCOA,wxT("wxTopLevelWindowCocoa=%p::CocoaDelegate_windowDidResignMain"),this);

 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowWillClose(void)
 {
     m_closed = true;
     Destroy();
 }
 
 void wxTopLevelWindowCocoa::CocoaDelegate_windowWillClose(void)
 {
     m_closed = true;
     Destroy();

-    /* Be SURE that idle events get ran.  If the window was not active when
-    it was closed, then there will be no more events to trigger this and
-    therefore it must be done here */
-    wxTheApp->CocoaInstallRequestedIdleHandler();

 }
 
 bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose()
 }
 
 bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose()


@@ -201,6 +247,15 @@ bool wxTopLevelWindowCocoa::CocoaDelegate_windowShouldClose()
     return wxWindowBase::Close(false);
 }
 
     return wxWindowBase::Close(false);
 }
 

+void wxTopLevelWindowCocoa::CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem)
+{
+}
+
+bool wxTopLevelWindowCocoa::CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem)
+{
+    return false;
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa maximize/minimize
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowCocoa maximize/minimize
 // ----------------------------------------------------------------------------


@@ -211,7 +266,7 @@ void wxTopLevelWindowCocoa::Maximize(bool maximize)
 
 bool wxTopLevelWindowCocoa::IsMaximized() const
 {
 
 bool wxTopLevelWindowCocoa::IsMaximized() const
 {

-    return false ; 
+    return false ;

 }
 
 void wxTopLevelWindowCocoa::Iconize(bool iconize)
 }
 
 void wxTopLevelWindowCocoa::Iconize(bool iconize)


@@ -220,7 +275,7 @@ void wxTopLevelWindowCocoa::Iconize(bool iconize)
 
 bool wxTopLevelWindowCocoa::IsIconized() const
 {
 
 bool wxTopLevelWindowCocoa::IsIconized() const
 {

-    return FALSE;
+    return false;

 }
 
 void wxTopLevelWindowCocoa::Restore()
 }
 
 void wxTopLevelWindowCocoa::Restore()


@@ -234,7 +289,7 @@ bool wxTopLevelWindowCocoa::Show(bool show)
     wxAutoNSAutoreleasePool pool;
     if(show)
     {
     wxAutoNSAutoreleasePool pool;
     if(show)
     {

-        // Send the window a size event because wxWindows apps expect it
+        // Send the window a size event because wxWidgets apps expect it

         // NOTE: This should really only be done the first time a window
         // is shown.  I doubt this will cause any problems though.
         wxSizeEvent event(GetSize(), GetId());
         // NOTE: This should really only be done the first time a window
         // is shown.  I doubt this will cause any problems though.
         wxSizeEvent event(GetSize(), GetId());


@@ -277,14 +332,25 @@ void wxTopLevelWindowCocoa::OnCloseWindow(wxCloseEvent& event)
 // wxTopLevelWindowCocoa misc
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowCocoa misc
 // ----------------------------------------------------------------------------
 

+void wxTopLevelWindowCocoa::SetTitle( const wxString& WXUNUSED(title))
+{
+    // TODO
+}
+
+wxString wxTopLevelWindowCocoa::GetTitle() const
+{
+    // TODO
+    return wxEmptyString;
+}
+

 bool wxTopLevelWindowCocoa::ShowFullScreen(bool show, long style)
 {
 bool wxTopLevelWindowCocoa::ShowFullScreen(bool show, long style)
 {

-    return FALSE;
+    return false;

 }
 
 bool wxTopLevelWindowCocoa::IsFullScreen() const
 {
 }
 
 bool wxTopLevelWindowCocoa::IsFullScreen() const
 {

-    return FALSE;
+    return false;

 }
 
 void wxTopLevelWindowCocoa::CocoaSetWxWindowSize(int width, int height)
 }
 
 void wxTopLevelWindowCocoa::CocoaSetWxWindowSize(int width, int height)


@@ -305,7 +371,7 @@ void wxTopLevelWindowCocoa::CocoaSetWxWindowSize(int width, int height)
 
 void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
 
 void wxTopLevelWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {

-//    wxLogDebug("wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)",this,x,y,width,height);
+    wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoMoveWindow(%d,%d,%d,%d)"),this,x,y,width,height);

 
     NSRect cocoaRect = NSMakeRect(x,y,width,height);
     [m_cocoaNSWindow setFrame: cocoaRect display:NO];
 
     NSRect cocoaRect = NSMakeRect(x,y,width,height);
     [m_cocoaNSWindow setFrame: cocoaRect display:NO];


@@ -318,7 +384,7 @@ void wxTopLevelWindowCocoa::DoGetSize(int *w, int *h) const
         *w=(int)cocoaRect.size.width;
     if(h)
         *h=(int)cocoaRect.size.height;
         *w=(int)cocoaRect.size.width;
     if(h)
         *h=(int)cocoaRect.size.height;

-//    wxLogDebug("wxTopLevelWindow=%p::DoGetSize = (%d,%d)",this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);
+    wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoGetSize = (%d,%d)"),this,(int)cocoaRect.size.width,(int)cocoaRect.size.height);

 }
 
 void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
 }
 
 void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const


@@ -328,6 +394,5 @@ void wxTopLevelWindowCocoa::DoGetPosition(int *x, int *y) const
         *x=(int)cocoaRect.origin.x;
     if(y)
         *y=(int)cocoaRect.origin.y;
         *x=(int)cocoaRect.origin.x;
     if(y)
         *y=(int)cocoaRect.origin.y;

-//    wxLogDebug("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)",this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);
+    wxLogTrace(wxTRACE_COCOA_TopLevelWindow_Size,wxT("wxTopLevelWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y);

 }
 }

-