check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index f7328f7864768e6bab4faceefc6af31992a946eb..ccf9e885f51d37b9f06b80ef977b4d3af9a695a1 100644 (file)
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -128,7 +128,7 @@ wxAuiTabArt* wxAuiMDIParentFrame::GetArtProvider()
 {
     if (!m_pClientWindow)
         return NULL;
 {
     if (!m_pClientWindow)
         return NULL;

-    
+

     return m_pClientWindow->GetArtProvider();
 }
 
     return m_pClientWindow->GetArtProvider();
 }
 


@@ -177,12 +177,15 @@ void wxAuiMDIParentFrame::SetChildMenuBar(wxAuiMDIChildFrame* pChild)
     if (!pChild)
     {
         // No Child, set Our menu bar back.
     if (!pChild)
     {
         // No Child, set Our menu bar back.

-        SetMenuBar(m_pMyMenuBar);
+        if (m_pMyMenuBar)
+            SetMenuBar(m_pMyMenuBar);
+        else
+            SetMenuBar(GetMenuBar());

 
         // Make sure we know our menu bar is in use
         m_pMyMenuBar = NULL;
     }
 
         // Make sure we know our menu bar is in use
         m_pMyMenuBar = NULL;
     }

-     else
+    else

     {
         if (pChild->GetMenuBar() == NULL)
             return;
     {
         if (pChild->GetMenuBar() == NULL)
             return;


@@ -202,7 +205,7 @@ bool wxAuiMDIParentFrame::ProcessEvent(wxEvent& event)
     if (m_pLastEvt == &event)
         return false;
     m_pLastEvt = &event;
     if (m_pLastEvt == &event)
         return false;
     m_pLastEvt = &event;

-    
+

     // let the active child (if any) process the event first.
     bool res = false;
     if (m_pActiveChild &&
     // let the active child (if any) process the event first.
     bool res = false;
     if (m_pActiveChild &&


@@ -311,7 +314,7 @@ void wxAuiMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar)
         int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,wxSTOCK_NOFLAGS));
         if (pos == wxNOT_FOUND)
             pMenuBar->Append(m_pWindowMenu, _("&Window"));
         int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,wxSTOCK_NOFLAGS));
         if (pos == wxNOT_FOUND)
             pMenuBar->Append(m_pWindowMenu, _("&Window"));

-             else
+        else

             pMenuBar->Insert(pos, m_pWindowMenu, _("&Window"));
     }
 }
             pMenuBar->Insert(pos, m_pWindowMenu, _("&Window"));
     }
 }


@@ -331,11 +334,6 @@ void wxAuiMDIParentFrame::DoHandleMenu(wxCommandEvent& event)
                 {
                     return; // failure
                 }
                 {
                     return; // failure
                 }

-                 else
-                {
-                    delete m_pActiveChild;
-                    m_pActiveChild = NULL;
-                }

             }
             break;
         case wxWINDOWNEXT:
             }
             break;
         case wxWINDOWNEXT:


@@ -359,16 +357,16 @@ void wxAuiMDIParentFrame::Tile(wxOrientation orient)
 {
     wxAuiMDIClientWindow* client_window = GetClientWindow();
     wxASSERT_MSG(client_window, wxT("Missing MDI Client Window"));
 {
     wxAuiMDIClientWindow* client_window = GetClientWindow();
     wxASSERT_MSG(client_window, wxT("Missing MDI Client Window"));

-    
+

     int cur_idx = client_window->GetSelection();
     if (cur_idx == -1)
         return;
     int cur_idx = client_window->GetSelection();
     if (cur_idx == -1)
         return;

-        
+

     if (orient == wxVERTICAL)
     {
         client_window->Split(cur_idx, wxLEFT);
     }
     if (orient == wxVERTICAL)
     {
         client_window->Split(cur_idx, wxLEFT);
     }

-     else if (orient == wxHORIZONTAL)
+    else if (orient == wxHORIZONTAL)

     {
         client_window->Split(cur_idx, wxTOP);
     }
     {
         client_window->Split(cur_idx, wxTOP);
     }


@@ -401,7 +399,7 @@ wxAuiMDIChildFrame::wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent,
                                        const wxString& name)
 {
     Init();
                                        const wxString& name)
 {
     Init();

-    
+

     // There are two ways to create an tabbed mdi child fram without
     // making it the active document.  Either Show(false) can be called
     // before Create() (as is customary on some ports with wxFrame-type
     // There are two ways to create an tabbed mdi child fram without
     // making it the active document.  Either Show(false) can be called
     // before Create() (as is customary on some ports with wxFrame-type


@@ -411,7 +409,7 @@ wxAuiMDIChildFrame::wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent,
     // onto the panel underneath.
     if (style & wxMINIMIZE)
         m_activate_on_create = false;
     // onto the panel underneath.
     if (style & wxMINIMIZE)
         m_activate_on_create = false;

-        
+

     Create(parent, id, title, wxDefaultPosition, size, 0, name);
 }
 
     Create(parent, id, title, wxDefaultPosition, size, 0, name);
 }
 


@@ -423,7 +421,7 @@ wxAuiMDIChildFrame::~wxAuiMDIChildFrame()
         pParentFrame->SetActiveChild(NULL);
         pParentFrame->SetChildMenuBar(NULL);
     }
         pParentFrame->SetActiveChild(NULL);
         pParentFrame->SetChildMenuBar(NULL);
     }

-    
+

 #if wxUSE_MENUS
     wxDELETE(m_pMenuBar);
 #endif // wxUSE_MENUS
 #if wxUSE_MENUS
     wxDELETE(m_pMenuBar);
 #endif // wxUSE_MENUS


@@ -448,10 +446,10 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
 
     // create the window off-screen to prevent flicker
     wxPanel::Create(pClientWindow,
 
     // create the window off-screen to prevent flicker
     wxPanel::Create(pClientWindow,

-                   id,
-                   wxPoint(cli_size.x+1, cli_size.y+1),
-                   size,
-                   wxNO_BORDER, name);
+                    id,
+                    wxPoint(cli_size.x+1, cli_size.y+1),
+                    size,
+                    wxNO_BORDER, name);

 
     DoShow(false);
 
 
     DoShow(false);
 


@@ -464,7 +462,7 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
 
     pClientWindow->AddPage(this, title, m_activate_on_create);
     pClientWindow->Refresh();
 
     pClientWindow->AddPage(this, title, m_activate_on_create);
     pClientWindow->Refresh();

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -482,7 +480,7 @@ bool wxAuiMDIChildFrame::Destroy()
         wxActivateEvent event(wxEVT_ACTIVATE, false, GetId());
         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);
         wxActivateEvent event(wxEVT_ACTIVATE, false, GetId());
         event.SetEventObject(this);
         GetEventHandler()->ProcessEvent(event);

-        
+

         pParentFrame->SetActiveChild(NULL);
         pParentFrame->SetChildMenuBar(NULL);
     }
         pParentFrame->SetActiveChild(NULL);
         pParentFrame->SetChildMenuBar(NULL);
     }


@@ -570,15 +568,15 @@ void wxAuiMDIChildFrame::SetIcon(const wxIcon& icon)
     wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame"));
 
     m_icon = icon;
     wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame"));
 
     m_icon = icon;

-    
+

     wxBitmap bmp;
     bmp.CopyFromIcon(m_icon);
     wxBitmap bmp;
     bmp.CopyFromIcon(m_icon);

-        
+

     wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
     if (pClientWindow != NULL)
     {
         int idx = pClientWindow->GetPageIndex(this);
     wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
     if (pClientWindow != NULL)
     {
         int idx = pClientWindow->GetPageIndex(this);

-        
+

         if (idx != -1)
         {
             pClientWindow->SetPageBitmap((size_t)idx, bmp);
         if (idx != -1)
         {
             pClientWindow->SetPageBitmap((size_t)idx, bmp);


@@ -590,8 +588,8 @@ const wxIcon& wxAuiMDIChildFrame::GetIcon() const
 {
     return m_icon;
 }
 {
     return m_icon;
 }

-    
-    
+
+

 void wxAuiMDIChildFrame::Activate()
 {
     wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
 void wxAuiMDIChildFrame::Activate()
 {
     wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();


@@ -659,7 +657,7 @@ void wxAuiMDIChildFrame::Init()
 bool wxAuiMDIChildFrame::Show(bool show)
 {
     m_activate_on_create = show;
 bool wxAuiMDIChildFrame::Show(bool show)
 {
     m_activate_on_create = show;

-    
+

     // do nothing
     return true;
 }
     // do nothing
     return true;
 }


@@ -725,11 +723,11 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
 {
     SetWindowStyleFlag(style);
 
 {
     SetWindowStyleFlag(style);
 

-    wxSize caption_icon_size = 
+    wxSize caption_icon_size =

             wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X),
                    wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
     SetUniformBitmapSize(caption_icon_size);
             wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X),
                    wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
     SetUniformBitmapSize(caption_icon_size);

-    
+

     if (!wxAuiNotebook::Create(parent,
                                wxID_ANY,
                                wxPoint(0,0),
     if (!wxAuiNotebook::Create(parent,
                                wxID_ANY,
                                wxPoint(0,0),


@@ -757,7 +755,7 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
     // don't do anything if the page doesn't actually change
     if (old_selection == new_selection)
         return;
     // don't do anything if the page doesn't actually change
     if (old_selection == new_selection)
         return;

-        
+

     /*
     // don't do anything if the new page is already active
     if (new_selection != -1)
     /*
     // don't do anything if the new page is already active
     if (new_selection != -1)


@@ -766,8 +764,8 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
         if (child->GetMDIParentFrame()->GetActiveChild() == child)
             return;
     }*/
         if (child->GetMDIParentFrame()->GetActiveChild() == child)
             return;
     }*/

-    
-    
+
+

     // notify old active child that it has been deactivated
     if (old_selection != -1)
     {
     // notify old active child that it has been deactivated
     if (old_selection != -1)
     {


@@ -778,24 +776,24 @@ void wxAuiMDIClientWindow::PageChanged(int old_selection, int new_selection)
         event.SetEventObject(old_child);
         old_child->GetEventHandler()->ProcessEvent(event);
     }
         event.SetEventObject(old_child);
         old_child->GetEventHandler()->ProcessEvent(event);
     }

-     
+

     // notify new active child that it has been activated
     if (new_selection != -1)
     {
         wxAuiMDIChildFrame* active_child = (wxAuiMDIChildFrame*)GetPage(new_selection);
         wxASSERT_MSG(active_child, wxT("wxAuiMDIClientWindow::PageChanged - null page pointer"));
     // notify new active child that it has been activated
     if (new_selection != -1)
     {
         wxAuiMDIChildFrame* active_child = (wxAuiMDIChildFrame*)GetPage(new_selection);
         wxASSERT_MSG(active_child, wxT("wxAuiMDIClientWindow::PageChanged - null page pointer"));

-        
+

         wxActivateEvent event(wxEVT_ACTIVATE, true, active_child->GetId());
         event.SetEventObject(active_child);
         active_child->GetEventHandler()->ProcessEvent(event);
         wxActivateEvent event(wxEVT_ACTIVATE, true, active_child->GetId());
         event.SetEventObject(active_child);
         active_child->GetEventHandler()->ProcessEvent(event);

-        
+

         if (active_child->GetMDIParentFrame())
         {
             active_child->GetMDIParentFrame()->SetActiveChild(active_child);
             active_child->GetMDIParentFrame()->SetChildMenuBar(active_child);
         }
     }
         if (active_child->GetMDIParentFrame())
         {
             active_child->GetMDIParentFrame()->SetActiveChild(active_child);
             active_child->GetMDIParentFrame()->SetChildMenuBar(active_child);
         }
     }

-    
+

 
 }
 
 
 }
 


@@ -803,9 +801,9 @@ void wxAuiMDIClientWindow::OnPageClose(wxAuiNotebookEvent& evt)
 {
     wxAuiMDIChildFrame* wnd;
     wnd = static_cast<wxAuiMDIChildFrame*>(GetPage(evt.GetSelection()));
 {
     wxAuiMDIChildFrame* wnd;
     wnd = static_cast<wxAuiMDIChildFrame*>(GetPage(evt.GetSelection()));

-    
+

     wnd->Close();
     wnd->Close();

-    
+

     // regardless of the result of wnd->Close(), we've
     // already taken care of the close operations, so
     // suppress further processing
     // regardless of the result of wnd->Close(), we've
     // already taken care of the close operations, so
     // suppress further processing