Halfway reasonable implementation of wxFont for wxCocoa.

[wxWidgets.git] / src / aui / framemanager.cpp

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 5ae4d181a1124849472bbba23bd3ad6343aed0e8..7c552d924392fe666b2c29010ce9a035007364e1 100644 (file)
--- a/src/aui/framemanager.cpp
+++ b/src/aui/framemanager.cpp
@@ -28,6 +28,7 @@
 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
 #include "wx/aui/floatpane.h"
 #include "wx/aui/framemanager.h"
 #include "wx/aui/dockart.h"
 #include "wx/aui/floatpane.h"

+#include "wx/aui/tabmdi.h"

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


@@ -151,7 +152,7 @@ public:
             wxRect rect(upd.GetRect());
             dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
 
             wxRect rect(upd.GetRect());
             dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
 

-            upd++;
+            ++upd;

         }
     }
 
         }
     }
 


@@ -528,6 +529,13 @@ wxAuiFloatingFrame* wxAuiManager::CreateFloatingFrame(wxWindow* parent,
     return new wxAuiFloatingFrame(parent, this, pane_info);
 }
 
     return new wxAuiFloatingFrame(parent, this, pane_info);
 }
 

+bool wxAuiManager::CanDockPanel(const wxAuiPaneInfo & WXUNUSED(p))
+{
+    // if a key modifier is pressed while dragging the frame,
+    // don't dock the window
+    return !(wxGetKeyState(WXK_CONTROL) || wxGetKeyState(WXK_ALT));
+}
+

 // GetPane() looks up a wxAuiPaneInfo structure based
 // on the supplied window pointer.  Upon failure, GetPane()
 // returns an empty wxAuiPaneInfo, a condition which can be checked
 // GetPane() looks up a wxAuiPaneInfo structure based
 // on the supplied window pointer.  Upon failure, GetPane()
 // returns an empty wxAuiPaneInfo, a condition which can be checked


@@ -769,6 +777,17 @@ void wxAuiManager::SetManagedWindow(wxWindow* wnd)
                 wxAuiPaneInfo().Name(wxT("mdiclient")).
                 CenterPane().PaneBorder(false));
     }
                 wxAuiPaneInfo().Name(wxT("mdiclient")).
                 CenterPane().PaneBorder(false));
     }

+    else if (m_frame->IsKindOf(CLASSINFO(wxAuiMDIParentFrame)))
+    {
+        wxAuiMDIParentFrame* mdi_frame = (wxAuiMDIParentFrame*)m_frame;
+        wxAuiMDIClientWindow* client_window = mdi_frame->GetClientWindow();
+        wxASSERT_MSG(client_window, wxT("Client window is NULL!"));
+
+        AddPane(client_window,
+                wxAuiPaneInfo().Name(wxT("mdiclient")).
+                CenterPane().PaneBorder(false));
+    }
+

 #endif
 
     UpdateHintWindowConfig();
 #endif
 
     UpdateHintWindowConfig();


@@ -911,7 +930,8 @@ bool wxAuiManager::AddPane(wxWindow* window, const wxAuiPaneInfo& pane_info)
             // I believe this to be the correct action, until
             // wxToolBar::GetBestSize() is fixed.  Is this assumption
             // correct?
             // I believe this to be the correct action, until
             // wxToolBar::GetBestSize() is fixed.  Is this assumption
             // correct?

-            pinfo.best_size.y++;
+            // commented out by JACS 2007-9-08 after having added a pixel in wxMSW's wxToolBar::DoGetBestSize()
+            // pinfo.best_size.y++;

         }
 
         if (pinfo.min_size != wxDefaultSize)
         }
 
         if (pinfo.min_size != wxDefaultSize)


@@ -1073,8 +1093,7 @@ bool wxAuiManager::DetachPane(wxWindow* window)
     return false;
 }
 
     return false;
 }
 

-// ClosePane() destroys or hides the pane depending on its
-// flags
+// ClosePane() destroys or hides the pane depending on its flags

 void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info)
 {
     // if we were maximized, restore
 void wxAuiManager::ClosePane(wxAuiPaneInfo& pane_info)
 {
     // if we were maximized, restore


@@ -1427,12 +1446,11 @@ bool wxAuiManager::LoadPerspective(const wxString& layout, bool update)
         if (!p.IsOk())
         {
             // the pane window couldn't be found
         if (!p.IsOk())
         {
             // the pane window couldn't be found

-            // in the existing layout
-            return false;
+            // in the existing layout -- skip it
+            continue;

         }
 
         p.SafeSet(pane);
         }
 
         p.SafeSet(pane);

-

     }
 
     if (update)
     }
 
     if (update)


@@ -2070,6 +2088,8 @@ wxSizer* wxAuiManager::LayoutAll(wxAuiPaneInfoArray& panes,
                 dock.fixed = false;
             if (!pane.IsToolbar())
                 dock.toolbar = false;
                 dock.fixed = false;
             if (!pane.IsToolbar())
                 dock.toolbar = false;

+            if (pane.HasFlag(wxAuiPaneInfo::optionDockFixed))
+                dock.fixed = true;

             if (pane.state & wxAuiPaneInfo::actionPane)
                 action_pane_marked = true;
         }
             if (pane.state & wxAuiPaneInfo::actionPane)
                 action_pane_marked = true;
         }


@@ -2273,6 +2293,8 @@ void wxAuiManager::GetDockSizeConstraint(double* width_pct, double* height_pct)
 
 void wxAuiManager::Update()
 {
 
 void wxAuiManager::Update()
 {

+    m_hover_button = NULL;
+

     wxSizer* sizer;
     int i, pane_count = m_panes.GetCount();
 
     wxSizer* sizer;
     int i, pane_count = m_panes.GetCount();
 


@@ -2292,21 +2314,21 @@ void wxAuiManager::Update()
             p.window->SetSize(1,1);
 
 
             p.window->SetSize(1,1);
 
 

-               // the following block is a workaround for bug #1531361
-               // (see wxWidgets sourceforge page).  On wxGTK (only), when
-               // a frame is shown/hidden, a move event unfortunately
-               // also gets fired.  Because we may be dragging around
-               // a pane, we need to cancel that action here to prevent
-               // a spurious crash.
-               if (m_action_window == p.frame)
-               {
-                       if (wxWindow::GetCapture() == m_frame)
+            // the following block is a workaround for bug #1531361
+            // (see wxWidgets sourceforge page).  On wxGTK (only), when
+            // a frame is shown/hidden, a move event unfortunately
+            // also gets fired.  Because we may be dragging around
+            // a pane, we need to cancel that action here to prevent
+            // a spurious crash.
+            if (m_action_window == p.frame)
+            {
+                if (wxWindow::GetCapture() == m_frame)

                     m_frame->ReleaseMouse();
                 m_action = actionNone;
                     m_frame->ReleaseMouse();
                 m_action = actionNone;

-                       m_action_window = NULL;
-               }
+                m_action_window = NULL;
+            }

 
 

-               // hide the frame
+            // hide the frame

             if (p.frame->IsShown())
                 p.frame->Show(false);
 
             if (p.frame->IsShown())
                 p.frame->Show(false);
 


@@ -2361,7 +2383,7 @@ void wxAuiManager::Update()
             {
                 // frame already exists, make sure it's position
                 // and size reflect the information in wxAuiPaneInfo
             {
                 // frame already exists, make sure it's position
                 // and size reflect the information in wxAuiPaneInfo

-                if (p.frame->GetPosition() != p.floating_pos)
+                if ((p.frame->GetPosition() != p.floating_pos) || (p.frame->GetSize() != p.floating_size))

                 {
                     p.frame->SetSize(p.floating_pos.x, p.floating_pos.y,
                                      p.floating_size.x, p.floating_size.y,
                 {
                     p.frame->SetSize(p.floating_pos.x, p.floating_pos.y,
                                      p.floating_size.x, p.floating_size.y,


@@ -2762,16 +2784,11 @@ bool wxAuiManager::DoDrop(wxAuiDockInfoArray& docks,
 
             return ProcessDockResult(target, drop);
         }
 
             return ProcessDockResult(target, drop);
         }

-        else
-        {
-            m_skipping = false;
-        }

 
 

-        if (!m_skipping)
-        {
-            m_last_rect = part->dock->rect;
-            m_last_rect.Inflate( 15, 15 );
-        }
+        m_skipping = false;
+
+        m_last_rect = part->dock->rect;
+        m_last_rect.Inflate( 15, 15 );

 
         drop.Dock().
              Direction(part->dock->dock_direction).
 
         drop.Dock().
              Direction(part->dock->dock_direction).


@@ -3061,6 +3078,7 @@ void wxAuiManager::ShowHint(const wxRect& rect)
             m_hint_fadeamt = 0;
 
         m_hint_wnd->SetSize(rect);
             m_hint_fadeamt = 0;
 
         m_hint_wnd->SetSize(rect);

+        m_hint_wnd->SetTransparent(m_hint_fadeamt);

 
         if (!m_hint_wnd->IsShown())
             m_hint_wnd->Show();
 
         if (!m_hint_wnd->IsShown())
             m_hint_wnd->Show();


@@ -3070,7 +3088,6 @@ void wxAuiManager::ShowHint(const wxRect& rect)
         if (m_action == actionDragFloatingPane && m_action_window)
             m_action_window->SetFocus();
 
         if (m_action == actionDragFloatingPane && m_action_window)
             m_action_window->SetFocus();
 

-        m_hint_wnd->SetTransparent(m_hint_fadeamt);

         m_hint_wnd->Raise();
 
 
         m_hint_wnd->Raise();
 
 


@@ -3209,6 +3226,7 @@ wxRect wxAuiManager::CalculateHintRect(wxWindow* pane_window,
     wxAuiDockUIPartArray uiparts;
     wxAuiPaneInfo hint = GetPane(pane_window);
     hint.name = wxT("__HINT__");
     wxAuiDockUIPartArray uiparts;
     wxAuiPaneInfo hint = GetPane(pane_window);
     hint.name = wxT("__HINT__");

+    hint.PaneBorder(true);

     hint.Show();
 
     if (!hint.IsOk())
     hint.Show();
 
     if (!hint.IsOk())


@@ -3358,27 +3376,24 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
     // no hint for toolbar floating windows
     if (pane.IsToolbar() && m_action == actionDragFloatingPane)
     {
     // no hint for toolbar floating windows
     if (pane.IsToolbar() && m_action == actionDragFloatingPane)
     {

-        if (m_action == actionDragFloatingPane)
-        {
-            wxAuiDockInfoArray docks;
-            wxAuiPaneInfoArray panes;
-            wxAuiDockUIPartArray uiparts;
-            wxAuiPaneInfo hint = pane;
+        wxAuiDockInfoArray docks;
+        wxAuiPaneInfoArray panes;
+        wxAuiDockUIPartArray uiparts;
+        wxAuiPaneInfo hint = pane;

 
 

-            CopyDocksAndPanes(docks, panes, m_docks, m_panes);
+        CopyDocksAndPanes(docks, panes, m_docks, m_panes);

 
 

-            // find out where the new pane would be
-            if (!DoDrop(docks, panes, hint, client_pt))
-                return;
-            if (hint.IsFloating())
-                return;
+        // find out where the new pane would be
+        if (!DoDrop(docks, panes, hint, client_pt))
+            return;
+        if (hint.IsFloating())
+            return;

 
 

-            pane = hint;
-            m_action = actionDragToolbarPane;
-            m_action_window = pane.window;
+        pane = hint;
+        m_action = actionDragToolbarPane;
+        m_action_window = pane.window;

 
 

-            Update();
-        }
+        Update();

 
         return;
     }
 
         return;
     }


@@ -3386,7 +3401,7 @@ void wxAuiManager::OnFloatingPaneMoving(wxWindow* wnd, wxDirection dir)
 
     // if a key modifier is pressed while dragging the frame,
     // don't dock the window
 
     // if a key modifier is pressed while dragging the frame,
     // don't dock the window

-    if (wxGetKeyState(WXK_CONTROL) || wxGetKeyState(WXK_ALT))
+    if (!CanDockPanel(pane))

     {
         HideHint();
         return;
     {
         HideHint();
         return;


@@ -3461,7 +3476,7 @@ void wxAuiManager::OnFloatingPaneMoved(wxWindow* wnd, wxDirection dir)
 
     // if a key modifier is pressed while dragging the frame,
     // don't dock the window
 
     // if a key modifier is pressed while dragging the frame,
     // don't dock the window

-    if (!wxGetKeyState(WXK_CONTROL) && !wxGetKeyState(WXK_ALT))
+    if (CanDockPanel(pane))

     {
         // do the drop calculation
         DoDrop(m_docks, m_panes, pane, client_pt, action_offset);
     {
         // do the drop calculation
         DoDrop(m_docks, m_panes, pane, client_pt, action_offset);


@@ -3516,7 +3531,15 @@ void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)
     }
     else
     {
     }
     else
     {

-        ClosePane(pane);
+        // close the pane, but check that it
+        // still exists in our pane array first
+        // (the event handler above might have removed it)
+
+        wxAuiPaneInfo& check = GetPane(wnd);
+        if (check.IsOk())
+        {
+            ClosePane(pane);
+        }

     }
 }
 
     }
 }
 


@@ -3524,11 +3547,8 @@ void wxAuiManager::OnFloatingPaneClosed(wxWindow* wnd, wxCloseEvent& evt)
 
 void wxAuiManager::OnFloatingPaneActivated(wxWindow* wnd)
 {
 
 void wxAuiManager::OnFloatingPaneActivated(wxWindow* wnd)
 {

-    if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
+    if ((GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE) && GetPane(wnd).IsOk())

     {
     {

-        // try to find the pane
-        wxASSERT_MSG(GetPane(wnd).IsOk(), wxT("Pane window not found"));
-

         SetActivePane(m_panes, wnd);
         Repaint();
     }
         SetActivePane(m_panes, wnd);
         Repaint();
     }


@@ -3542,8 +3562,8 @@ void wxAuiManager::OnRender(wxAuiManagerEvent& evt)
 {
     // if the frame is about to be deleted, don't bother
     if (!m_frame || wxPendingDelete.Member(m_frame))
 {
     // if the frame is about to be deleted, don't bother
     if (!m_frame || wxPendingDelete.Member(m_frame))

-           return;
-        
+        return;
+

     wxDC* dc = evt.GetDC();
 
 #ifdef __WXMAC__
     wxDC* dc = evt.GetDC();
 
 #ifdef __WXMAC__


@@ -3555,8 +3575,8 @@ void wxAuiManager::OnRender(wxAuiManagerEvent& evt)
     {
         wxAuiDockUIPart& part = m_uiparts.Item(i);
 
     {
         wxAuiDockUIPart& part = m_uiparts.Item(i);
 

-        // don't draw hidden pane items
-        if (part.sizer_item && !part.sizer_item->IsShown())
+        // don't draw hidden pane items or items that aren't windows
+        if (part.sizer_item && ((!part.sizer_item->IsWindow() && !part.sizer_item->IsSpacer() && !part.sizer_item->IsSizer()) || !part.sizer_item->IsShown()))

             continue;
 
         switch (part.type)
             continue;
 
         switch (part.type)


@@ -3782,8 +3802,9 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event)
         if (part->type == wxAuiDockUIPart::typeDockSizer ||
             part->type == wxAuiDockUIPart::typePaneSizer)
         {
         if (part->type == wxAuiDockUIPart::typeDockSizer ||
             part->type == wxAuiDockUIPart::typePaneSizer)
         {

-            if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
-                return;
+            // Removing this restriction so that a centre pane can be resized
+            //if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
+            //    return;

 
             // a dock may not be resized if it has a single
             // pane which is not resizable
 
             // a dock may not be resized if it has a single
             // pane which is not resizable


@@ -3836,9 +3857,6 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event)
 
 
 
 
 
 

-            if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
-                return;
-

             if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
             {
                 // set the caption as active
             if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
             {
                 // set the caption as active


@@ -3846,6 +3864,9 @@ void wxAuiManager::OnLeftDown(wxMouseEvent& event)
                 Repaint();
             }
 
                 Repaint();
             }
 

+            if (part->dock && part->dock->dock_direction == wxAUI_DOCK_CENTER)
+                return;
+

             m_action = actionClickCaption;
             m_action_part = part;
             m_action_start = wxPoint(event.m_x, event.m_y);
             m_action = actionClickCaption;
             m_action_part = part;
             m_action_start = wxPoint(event.m_x, event.m_y);


@@ -4299,7 +4320,8 @@ void wxAuiManager::OnChildFocus(wxChildFocusEvent& event)
     // active panes are allowed by the owner)
     if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
     {
     // active panes are allowed by the owner)
     if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
     {

-        if (GetPane(event.GetWindow()).IsOk())
+        wxAuiPaneInfo& pane = GetPane(event.GetWindow());
+        if (pane.IsOk() && (pane.state & wxAuiPaneInfo::optionActive) == 0)

         {
             SetActivePane(m_panes, event.GetWindow());
             m_frame->Refresh();
         {
             SetActivePane(m_panes, event.GetWindow());
             m_frame->Refresh();


@@ -4328,7 +4350,16 @@ void wxAuiManager::OnPaneButton(wxAuiManagerEvent& evt)
 
         if (!e.GetVeto())
         {
 
         if (!e.GetVeto())
         {

-            ClosePane(pane);
+            // close the pane, but check that it
+            // still exists in our pane array first
+            // (the event handler above might have removed it)
+
+            wxAuiPaneInfo& check = GetPane(pane.window);
+            if (check.IsOk())
+            {
+                ClosePane(pane);
+            }
+            

             Update();
         }
     }
             Update();
         }
     }