fix off by one (or rather "off by border width") bug in ScrollWindow() (part of patch...

[wxWidgets.git] / src / mac / carbon / frame.cpp

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index a009da920021a5420cec854c49e708bce635cf3a..b4da3e565f4811e0a434d6d681b06343f37d4486 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        frame.cpp
+// Name:        src/mac/carbon/frame.cpp

 // Purpose:     wxFrame
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxFrame
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,19 +12,21 @@
 #include "wx/wxprec.h"
 
 #include "wx/frame.h"
 #include "wx/wxprec.h"
 
 #include "wx/frame.h"

-#include "wx/statusbr.h"
-#include "wx/toolbar.h"
-#include "wx/menuitem.h"
-#include "wx/menu.h"
-#include "wx/dcclient.h"
-#include "wx/dialog.h"
-#include "wx/settings.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+    #include "wx/settings.h"
+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+    #include "wx/menuitem.h"
+#endif // WX_PRECOMP

 
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;
 
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;

-extern wxList wxPendingDelete;

 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)


@@ -37,25 +39,14 @@ END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 #define WX_MAC_STATUSBAR_HEIGHT 18
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 #define WX_MAC_STATUSBAR_HEIGHT 18

+

 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 
 void wxFrame::Init()
 {
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 
 void wxFrame::Init()
 {

-    m_frameMenuBar = NULL;
-
-#if wxUSE_TOOLBAR
-    m_frameToolBar = NULL ;
-#endif
-    m_frameStatusBar = NULL;
-    m_winLastFocused = NULL ;
-
-    m_iconized = false;
-
-#if wxUSE_TOOLTIPS
-    m_hwndToolTip = 0;
-#endif
+    m_winLastFocused = NULL;

 }
 
 bool wxFrame::Create(wxWindow *parent,
 }
 
 bool wxFrame::Create(wxWindow *parent,


@@ -85,14 +76,14 @@ wxFrame::~wxFrame()
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();

-    
+

 #if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {
         int w, h;
         toolbar->GetSize(&w, &h);
 #if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {
         int w, h;
         toolbar->GetSize(&w, &h);

-        
+

         if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
         {
             pt.x += w;
         if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
         {
             pt.x += w;


@@ -104,8 +95,8 @@ wxPoint wxFrame::GetClientAreaOrigin() const
 #endif
         }
     }
 #endif
         }
     }

-#endif // wxUSE_TOOLBAR
-    
+#endif
+

     return pt;
 }
 
     return pt;
 }
 


@@ -116,7 +107,7 @@ bool wxFrame::Enable(bool enable)
 
     if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
     {
 
     if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
     {

-         int iMaxMenu = m_frameMenuBar->GetMenuCount();
+        int iMaxMenu = m_frameMenuBar->GetMenuCount();

         for ( int i = 0 ; i < iMaxMenu ; ++ i )
         {
             m_frameMenuBar->EnableTop( i , enable ) ;
         for ( int i = 0 ; i < iMaxMenu ; ++ i )
         {
             m_frameMenuBar->EnableTop( i , enable ) ;


@@ -126,15 +117,16 @@ bool wxFrame::Enable(bool enable)
     return true;
 }
 
     return true;
 }
 

+#if wxUSE_STATUSBAR

 wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
     const wxString& name)
 {
 wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
     const wxString& name)
 {

-    wxStatusBar *statusBar = NULL;
+    wxStatusBar *statusBar;

 
 

-    statusBar = new wxStatusBar(this, id,
-        style, name);
-    statusBar->SetSize( 100 , WX_MAC_STATUSBAR_HEIGHT ) ;
+    statusBar = new wxStatusBar(this, id, style, name);
+    statusBar->SetSize(100, WX_MAC_STATUSBAR_HEIGHT);

     statusBar->SetFieldsCount(number);
     statusBar->SetFieldsCount(number);

+

     return statusBar;
 }
 
     return statusBar;
 }
 


@@ -150,6 +142,7 @@ void wxFrame::PositionStatusBar()
         m_frameStatusBar->SetSize(0, h, w, WX_MAC_STATUSBAR_HEIGHT);
     }
 }
         m_frameStatusBar->SetSize(0, h, w, WX_MAC_STATUSBAR_HEIGHT);
     }
 }

+#endif // wxUSE_STATUSBAR

 
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)


@@ -157,18 +150,20 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 

+#if wxUSE_STATUSBAR

     if ( m_frameStatusBar )
     {
         wxSysColourChangedEvent event2;
     if ( m_frameStatusBar )
     {
         wxSysColourChangedEvent event2;

+

         event2.SetEventObject( m_frameStatusBar );
         m_frameStatusBar->ProcessEvent(event2);
     }
         event2.SetEventObject( m_frameStatusBar );
         m_frameStatusBar->ProcessEvent(event2);
     }

+#endif // wxUSE_STATUSBAR

 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
 
 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
 }
 

-

 // Default activation behaviour - set the focus for the first child
 // subwindow found.
 void wxFrame::OnActivate(wxActivateEvent& event)
 // Default activation behaviour - set the focus for the first child
 // subwindow found.
 void wxFrame::OnActivate(wxActivateEvent& event)


@@ -185,9 +180,7 @@ void wxFrame::OnActivate(wxActivateEvent& event)
             if ( win->IsTopLevel() )
             {
                 if ( win != this )
             if ( win->IsTopLevel() )
             {
                 if ( win != this )

-                {

                     m_winLastFocused = NULL;
                     m_winLastFocused = NULL;

-                }

 
                 break;
             }
 
                 break;
             }


@@ -200,58 +193,70 @@ void wxFrame::OnActivate(wxActivateEvent& event)
     else
     {
         // restore focus to the child which was last focused
     else
     {
         // restore focus to the child which was last focused

-        wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
-                                            : NULL;
-        if ( !parent )
-        {
+        wxWindow *parent = m_winLastFocused
+            ? m_winLastFocused->GetParent()
+            : NULL;
+
+        if (parent == NULL)

             parent = this;
             parent = this;

-        }

 
         wxSetFocusToChild(parent, &m_winLastFocused);
 
 
         wxSetFocusToChild(parent, &m_winLastFocused);
 

-        if ( m_frameMenuBar != NULL )
+        if (m_frameMenuBar != NULL)

         {
         {

-            m_frameMenuBar->MacInstallMenuBar() ;
+            m_frameMenuBar->MacInstallMenuBar();

         }
         }

-        else if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)))
+        else

         {
         {

-            // Trying toplevel frame menbar
-            if( ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar() )
-                ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar();
-         }
+            wxFrame *tlf = wxDynamicCast( wxTheApp->GetTopWindow(), wxFrame );
+            if (tlf != NULL)
+            {
+                // Trying top-level frame membar
+                if (tlf->GetMenuBar())
+                    tlf->GetMenuBar()->MacInstallMenuBar();
+            }
+        }

     }
 }
 
 void wxFrame::DetachMenuBar()
 {
     if ( m_frameMenuBar )
     }
 }
 
 void wxFrame::DetachMenuBar()
 {
     if ( m_frameMenuBar )

-    {

         m_frameMenuBar->UnsetInvokingWindow();
         m_frameMenuBar->UnsetInvokingWindow();

-    }

 
     wxFrameBase::DetachMenuBar();
 }
 
 void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 {
 
     wxFrameBase::DetachMenuBar();
 }
 
 void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 {

-    wxFrameBase::AttachMenuBar(menuBar);
+    wxFrame* tlf = wxDynamicCast( wxFindWinFromMacWindow( FrontNonFloatingWindow() ) , wxFrame );
+    bool makeCurrent = false;
+
+    // if this is already the current menubar or we are the frontmost window
+    if ( (tlf == this) || (m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar()) )
+        makeCurrent = true;
+    // or there is an app-level menubar like MDI
+    else if ( tlf && (tlf->GetMenuBar() == NULL) && (((wxFrame*)wxTheApp->GetTopWindow()) == this) )
+        makeCurrent = true;
+
+    wxFrameBase::AttachMenuBar( menuBar );

 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );

+        if (makeCurrent)
+            m_frameMenuBar->MacInstallMenuBar();

     }
 }
 
 void wxFrame::DoGetClientSize(int *x, int *y) const
 {
     }
 }
 
 void wxFrame::DoGetClientSize(int *x, int *y) const
 {

-    wxTopLevelWindow::DoGetClientSize( x , y ) ;
+    wxTopLevelWindow::DoGetClientSize( x , y );

 
 #if wxUSE_STATUSBAR
     if ( GetStatusBar() && GetStatusBar()->IsShown() && y )
 
 #if wxUSE_STATUSBAR
     if ( GetStatusBar() && GetStatusBar()->IsShown() && y )

-    {

         *y -= WX_MAC_STATUSBAR_HEIGHT;
         *y -= WX_MAC_STATUSBAR_HEIGHT;

-    }
-#endif // wxUSE_STATUSBAR
+#endif

 
 #if wxUSE_TOOLBAR
     wxToolBar *toolbar = GetToolBar();
 
 #if wxUSE_TOOLBAR
     wxToolBar *toolbar = GetToolBar();


@@ -262,16 +267,18 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
 
         if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
         {
 
         if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
         {

-            if ( x )  *x -= w;
+            if ( x )
+                *x -= w;

         }
         else
         {
 #if !wxMAC_USE_NATIVE_TOOLBAR
         }
         else
         {
 #if !wxMAC_USE_NATIVE_TOOLBAR

-            if ( y )  *y -= h;
+            if ( y )
+                *y -= h;

 #endif
         }
     }
 #endif
         }
     }

-#endif // wxUSE_TOOLBAR
+#endif

 }
 
 bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const
 }
 
 bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const


@@ -279,12 +286,12 @@ bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const
 #if wxUSE_STATUSBAR
     if ( child == GetStatusBar() )
         return false ;
 #if wxUSE_STATUSBAR
     if ( child == GetStatusBar() )
         return false ;

-#endif // wxUSE_STATUSBAR
+#endif

 
 #if wxUSE_TOOLBAR
     if ( child == GetToolBar() )
         return false ;
 
 #if wxUSE_TOOLBAR
     if ( child == GetToolBar() )
         return false ;

-#endif // wxUSE_TOOLBAR
+#endif

 
     return wxFrameBase::MacIsChildOfClientArea( child ) ;
 }
 
     return wxFrameBase::MacIsChildOfClientArea( child ) ;
 }


@@ -303,27 +310,25 @@ void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
 
     // find the current client size
 
 
     // find the current client size
 

-  // Find the difference between the entire window (title bar and all)
-  // and the client area; add this to the new client size to move the
-  // window
-
+    // Find the difference between the entire window (title bar and all) and
+    // the client area; add this to the new client size to move the window

     DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
         currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
 }
 
     DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
         currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
 }
 

-

 #if wxUSE_TOOLBAR
 void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
     if ( m_frameToolBar == toolbar )
         return ;
 #if wxUSE_TOOLBAR
 void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
     if ( m_frameToolBar == toolbar )
         return ;

-    
+

 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( m_frameToolBar )
 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( m_frameToolBar )

-        m_frameToolBar->MacInstallNativeToolbar(false) ;
+        m_frameToolBar->MacInstallNativeToolbar( false ) ;

 #endif
 #endif

-    
+

     m_frameToolBar = toolbar ;
     m_frameToolBar = toolbar ;

+

 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( toolbar )
         toolbar->MacInstallNativeToolbar( true ) ;
 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( toolbar )
         toolbar->MacInstallNativeToolbar( true ) ;


@@ -333,9 +338,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     if ( wxFrameBase::CreateToolBar(style, id, name) )
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     if ( wxFrameBase::CreateToolBar(style, id, name) )

-    {

         PositionToolBar();
         PositionToolBar();

-    }

 
     return m_frameToolBar;
 }
 
     return m_frameToolBar;
 }


@@ -345,20 +348,24 @@ void wxFrame::PositionToolBar()
     int cw, ch;
 
     GetSize( &cw , &ch ) ;
     int cw, ch;
 
     GetSize( &cw , &ch ) ;

+            
+    int statusX = 0 ;
+    int statusY = 0 ;

 
 

-    if ( GetStatusBar() && GetStatusBar()->IsShown())
+#if wxUSE_STATUSBAR
+    if (GetStatusBar() && GetStatusBar()->IsShown())

     {
     {

-      int statusX, statusY;
-      GetStatusBar()->GetClientSize(&statusX, &statusY);
-      ch -= statusY;
+        GetStatusBar()->GetClientSize(&statusX, &statusY);
+        ch -= statusY;

     }
     }

+#endif

 
     if (GetToolBar())
     {
         int tx, ty, tw, th;
 
     if (GetToolBar())
     {
         int tx, ty, tw, th;

-        tx = ty = 0 ;

 
 

-        GetToolBar()->GetSize(& tw, & th);
+        tx = ty = 0 ;
+        GetToolBar()->GetSize(&tw, &th);

         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS


@@ -366,6 +373,15 @@ void wxFrame::PositionToolBar()
             // have the original client size.
             GetToolBar()->SetSize(tx , ty , tw, ch , wxSIZE_NO_ADJUSTMENTS );
         }
             // have the original client size.
             GetToolBar()->SetSize(tx , ty , tw, ch , wxSIZE_NO_ADJUSTMENTS );
         }

+        else if (GetToolBar()->GetWindowStyleFlag() & wxTB_BOTTOM)
+        {
+            //FIXME: this positions the tool bar almost correctly, but still it doesn't work right yet,
+            //as 1) the space for the 'old' top toolbar is still taken up, and 2) the toolbar
+            //doesn't extend it's width to the width of the frame.
+            tx = 0;
+            ty = ch - (th + statusY);
+            GetToolBar()->SetSize(tx, ty, cw, th, wxSIZE_NO_ADJUSTMENTS );
+        }

         else
         {
 #if !wxMAC_USE_NATIVE_TOOLBAR
         else
         {
 #if !wxMAC_USE_NATIVE_TOOLBAR


@@ -375,4 +391,16 @@ void wxFrame::PositionToolBar()
         }
     }
 }
         }
     }
 }

+#endif // wxUSE_TOOLBAR
+
+void wxFrame::PositionBars()
+{
+#if wxUSE_STATUSBAR
+    PositionStatusBar();
+#endif
+#if wxUSE_TOOLBAR
+    PositionToolBar();

 #endif
 #endif

+}
+
+