multilib mode

[wxWidgets.git] / src / common / framecmn.cpp

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 3d94d675e1c6fd7eda261a6758e353947af197b6..cbf6bf21ee24a0501d9aef1c7ee4672dc29296e8 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -4,7 +4,7 @@
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
 // Id:          $Id$
 // Author:      Julian Smart, Vadim Zeitlin
 // Created:     01/02/97
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -27,10 +27,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/frame.h"
-#include "wx/menu.h"
-#include "wx/menuitem.h"
-#include "wx/dcclient.h"
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+    #include "wx/menu.h"
+    #include "wx/menuitem.h"
+    #include "wx/dcclient.h"
+#endif // WX_PRECOMP

 
 #if wxUSE_TOOLBAR
     #include "wx/toolbar.h"
 
 #if wxUSE_TOOLBAR
     #include "wx/toolbar.h"


@@ -43,11 +45,11 @@
 // event table
 // ----------------------------------------------------------------------------
 
 // event table
 // ----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxFrameBase, wxWindow)
-    EVT_IDLE(wxFrameBase::OnIdle)
-    EVT_CLOSE(wxFrameBase::OnCloseWindow)
+BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
+#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES
+    EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
+#endif

     EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
     EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)

-    EVT_SIZE(wxFrameBase::OnSize)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -60,7 +62,9 @@ END_EVENT_TABLE()
 
 wxFrameBase::wxFrameBase()
 {
 
 wxFrameBase::wxFrameBase()
 {

+#if wxUSE_MENUS

     m_frameMenuBar = NULL;
     m_frameMenuBar = NULL;

+#endif // wxUSE_MENUS

 
 #if wxUSE_TOOLBAR
     m_frameToolBar = NULL;
 
 #if wxUSE_TOOLBAR
     m_frameToolBar = NULL;


@@ -69,16 +73,13 @@ wxFrameBase::wxFrameBase()
 #if wxUSE_STATUSBAR
     m_frameStatusBar = NULL;
 #endif // wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR
     m_frameStatusBar = NULL;
 #endif // wxUSE_STATUSBAR

+
+    m_statusBarPane = 0;

 }
 
 }
 

-bool wxFrameBase::Destroy()
+wxFrameBase::~wxFrameBase()

 {
 {

-    // delayed destruction: the frame will be deleted during the next idle
-    // loop iteration
-    if ( !wxPendingDelete.Member(this) )
-        wxPendingDelete.Append(this);
-
-    return TRUE;
+    // this destructor is required for Darwin

 }
 
 wxFrame *wxFrameBase::New(wxWindow *parent,
 }
 
 wxFrame *wxFrameBase::New(wxWindow *parent,


@@ -94,11 +95,13 @@ wxFrame *wxFrameBase::New(wxWindow *parent,
 
 void wxFrameBase::DeleteAllBars()
 {
 
 void wxFrameBase::DeleteAllBars()
 {

+#if wxUSE_MENUS

     if ( m_frameMenuBar )
     {
         delete m_frameMenuBar;
         m_frameMenuBar = (wxMenuBar *) NULL;
     }
     if ( m_frameMenuBar )
     {
         delete m_frameMenuBar;
         m_frameMenuBar = (wxMenuBar *) NULL;
     }

+#endif // wxUSE_MENUS

 
 #if wxUSE_STATUSBAR
     if ( m_frameStatusBar )
 
 #if wxUSE_STATUSBAR
     if ( m_frameStatusBar )


@@ -117,6 +120,26 @@ void wxFrameBase::DeleteAllBars()
 #endif // wxUSE_TOOLBAR
 }
 
 #endif // wxUSE_TOOLBAR
 }
 

+bool wxFrameBase::IsOneOfBars(const wxWindow *win) const
+{
+#if wxUSE_MENUS
+    if ( win == GetMenuBar() )
+        return TRUE;
+#endif // wxUSE_MENUS
+
+#if wxUSE_STATUSBAR
+    if ( win == GetStatusBar() )
+        return TRUE;
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+    if ( win == GetToolBar() )
+        return TRUE;
+#endif // wxUSE_TOOLBAR
+
+    return FALSE;
+}
+

 // ----------------------------------------------------------------------------
 // wxFrame size management: we exclude the areas taken by menu/status/toolbars
 // from the client area, so the client area is what's really available for the
 // ----------------------------------------------------------------------------
 // wxFrame size management: we exclude the areas taken by menu/status/toolbars
 // from the client area, so the client area is what's really available for the


@@ -126,15 +149,16 @@ void wxFrameBase::DeleteAllBars()
 // get the origin of the client area in the client coordinates
 wxPoint wxFrameBase::GetClientAreaOrigin() const
 {
 // get the origin of the client area in the client coordinates
 wxPoint wxFrameBase::GetClientAreaOrigin() const
 {

-    wxPoint pt(0, 0);
+    wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();

 
 

-#if wxUSE_TOOLBAR
-    if ( GetToolBar() && GetToolBar()->IsShown() )
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && !defined(__WXWINCE__)
+    wxToolBar *toolbar = GetToolBar();
+    if ( toolbar && toolbar->IsShown() )

     {
         int w, h;
     {
         int w, h;

-        GetToolBar()->GetSize(& w, & h);
+        toolbar->GetSize(&w, &h);

 
 

-        if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )
+        if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )

         {
             pt.x += w;
         }
         {
             pt.x += w;
         }


@@ -148,138 +172,73 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

-void wxFrameBase::DoScreenToClient(int *x, int *y) const
-{
-    wxWindow::DoScreenToClient(x, y);
-
-    // We may be faking the client origin.
-    // So a window that's really at (0, 30) may appear
-    // (to wxWin apps) to be at (0, 0).
-    wxPoint pt(GetClientAreaOrigin());
-    *x -= pt.x;
-    *y -= pt.y;
-}
-
-void wxFrameBase::DoClientToScreen(int *x, int *y) const
-{
-    // We may be faking the client origin.
-    // So a window that's really at (0, 30) may appear
-    // (to wxWin apps) to be at (0, 0).
-    wxPoint pt1(GetClientAreaOrigin());
-    *x += pt1.x;
-    *y += pt1.y;
-
-    wxWindow::DoClientToScreen(x, y);
-}
-

 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
 

-// make the window modal (all other windows unresponsive)
-void wxFrameBase::MakeModal(bool modal)
-{
-    if ( modal )
-    {
-        wxEnableTopLevelWindows(FALSE);
-        Enable(TRUE);           // keep this window enabled
-    }
-    else
-    {
-        wxEnableTopLevelWindows(TRUE);
-    }
-}
-

 bool wxFrameBase::ProcessCommand(int id)
 {
 bool wxFrameBase::ProcessCommand(int id)
 {

+#if wxUSE_MENUS

     wxMenuBar *bar = GetMenuBar();
     if ( !bar )
         return FALSE;
 
     wxMenuBar *bar = GetMenuBar();
     if ( !bar )
         return FALSE;
 

-    wxMenuItem *item = bar->FindItem(id);
-    if ( item && item->IsCheckable() )
-    {
-        item->Toggle();
-    }
-

     wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
     wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);

-    commandEvent.SetInt(id);

     commandEvent.SetEventObject(this);
 
     commandEvent.SetEventObject(this);
 

-    return GetEventHandler()->ProcessEvent(commandEvent);
-}
-
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-// default resizing behaviour - if only ONE subwindow, resize to fill the
-// whole client area
-void wxFrameBase::OnSize(wxSizeEvent& WXUNUSED(event))
-{
-    // if we're using constraints - do use them
-#if wxUSE_CONSTRAINTS
-    if ( GetAutoLayout() )
-    {
-        Layout();
-    }
-    else
-#endif
+    wxMenuItem *item = bar->FindItem(id);
+    if (item)

     {
     {

-        // do we have _exactly_ one child?
-        wxWindow *child = (wxWindow *)NULL;
-        for ( wxWindowList::Node *node = GetChildren().GetFirst();
-              node;
-              node = node->GetNext() )
+        if (!item->IsEnabled())
+            return TRUE;
+
+        if (item->IsCheckable())

         {
         {

-            wxWindow *win = node->GetData();
+            item->Toggle();

 
 

-            // exclude top level and managed windows (status bar isn't
-            // currently in the children list except under wxMac anyhow, but
-            // it makes no harm to test for it)
-            if ( !win->IsTopLevel()
-#if wxUSE_STATUSBAR
-                    && (win != GetStatusBar())
-#endif // wxUSE_STATUSBAR
-#if wxUSE_TOOLBAR
-                    && (win != GetToolBar())
-#endif // wxUSE_TOOLBAR
-               )
-            {
-                if ( child )
-                {
-                    return;     // it's our second subwindow - nothing to do
-                }
-
-                child = win;
-            }
+            // use the new value
+            commandEvent.SetInt(item->IsChecked());

         }
         }

+    }

 
 

-        // do we have any children at all?
-        if ( child )
-        {
-            // exactly one child - set it's size to fill the whole frame
-            int clientW, clientH;
-            DoGetClientSize(&clientW, &clientH);
-
-            // for whatever reasons, wxGTK wants to have a small offset - it
-            // probably looks better with it?
-#ifdef __WXGTK__
-            static const int ofs = 1;
-#else
-            static const int ofs = 0;
+    GetEventHandler()->ProcessEvent(commandEvent);
+    return TRUE;
+#else // !wxUSE_MENUS
+    return FALSE;
+#endif // wxUSE_MENUS/!wxUSE_MENUS
+}
+
+// Do the UI update processing for this window. This is
+// provided for the application to call if it wants to
+// force a UI update, particularly for the menus and toolbar.
+void wxFrameBase::UpdateWindowUI(long flags)
+{
+    wxWindowBase::UpdateWindowUI(flags);
+    
+#if wxUSE_TOOLBAR
+    if (GetToolBar())
+        GetToolBar()->UpdateWindowUI(flags);

 #endif
 
 #endif
 

-            child->SetSize(ofs, ofs, clientW - 2*ofs, clientH - 2*ofs);
+#if wxUSE_MENUS
+    if (GetMenuBar())
+    {
+        if ((flags & wxUPDATE_UI_FROMIDLE) && !wxUSE_IDLEMENUUPDATES)
+        {
+            // If coming from an idle event, we only
+            // want to update the menus if we're
+            // in the wxUSE_IDLEMENUUPDATES configuration:
+            // so if we're not, do nothing

         }
         }

+        else
+            DoMenuUpdates();

     }
     }

+#endif

 }
 
 }
 

-// The default implementation for the close window event.
-void wxFrameBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    Destroy();
-}
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------

 
 void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
 {
 
 void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
 {


@@ -288,6 +247,24 @@ void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR
 }
 

+// Implement internal behaviour (menu updating on some platforms)
+void wxFrameBase::OnInternalIdle()
+{
+    wxTopLevelWindow::OnInternalIdle();
+    
+#if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
+    if (wxUpdateUIEvent::CanUpdate(this))
+        DoMenuUpdates();
+#endif
+}
+
+void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
+{
+#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES
+    DoMenuUpdates(event.GetMenu());
+#endif
+}
+

 // ----------------------------------------------------------------------------
 // status bar stuff
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // status bar stuff
 // ----------------------------------------------------------------------------


@@ -318,17 +295,6 @@ wxStatusBar *wxFrameBase::OnCreateStatusBar(int number,
 {
     wxStatusBar *statusBar = new wxStatusBar(this, id, style, name);
 
 {
     wxStatusBar *statusBar = new wxStatusBar(this, id, style, name);
 

-    // Set the height according to the font and the border size
-    wxClientDC dc(statusBar);
-    dc.SetFont(statusBar->GetFont());
-
-    wxCoord y;
-    dc.GetTextExtent( "X", NULL, &y );
-
-    int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY());
-
-    statusBar->SetSize( -1, -1, -1, height );
-

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


@@ -350,15 +316,28 @@ void wxFrameBase::SetStatusWidths(int n, const int widths_field[] )
     PositionStatusBar();
 }
 
     PositionStatusBar();
 }
 

-bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId)
+void wxFrameBase::PushStatusText(const wxString& text, int number)

 {
 {

-    if ( !statbar )
-        return FALSE;
+    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
+
+    m_frameStatusBar->PushStatusText(text, number);
+}
+
+void wxFrameBase::PopStatusText(int number)
+{
+    wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );

 
 

+    m_frameStatusBar->PopStatusText(number);
+}
+
+bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
+{
+#if wxUSE_MENUS

     // if no help string found, we will clear the status bar text
     wxString helpString;
     // if no help string found, we will clear the status bar text
     wxString helpString;

+    bool show = menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */;

 
 

-    if ( menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */ )
+    if ( show )

     {
         wxMenuBar *menuBar = GetMenuBar();
         if ( menuBar )
     {
         wxMenuBar *menuBar = GetMenuBar();
         if ( menuBar )


@@ -371,15 +350,29 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId)
         }
     }
 
         }
     }
 

-    // set status text even if the string is empty - this will at least
-    // remove the string from the item which was previously selected
-    statbar->SetStatusText(helpString);
+    DoGiveHelp(helpString, show);

 
     return !helpString.IsEmpty();
 
     return !helpString.IsEmpty();

+#else // !wxUSE_MENUS
+    return FALSE;
+#endif // wxUSE_MENUS/!wxUSE_MENUS

 }
 
 #endif // wxUSE_STATUSBAR
 
 }
 
 #endif // wxUSE_STATUSBAR
 

+void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
+{
+#if wxUSE_STATUSBAR
+    if ( m_statusBarPane < 0 ) return;
+    wxStatusBar* statbar = GetStatusBar();
+    if ( !statbar ) return;
+
+    wxString help = show ? text : wxString();
+    statbar->SetStatusText( help, m_statusBarPane );
+#endif // wxUSE_STATUSBAR
+}
+
+

 // ----------------------------------------------------------------------------
 // toolbar stuff
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // toolbar stuff
 // ----------------------------------------------------------------------------


@@ -395,6 +388,18 @@ wxToolBar* wxFrameBase::CreateToolBar(long style,
     wxCHECK_MSG( !m_frameToolBar, (wxToolBar *)NULL,
                  wxT("recreating toolbar in wxFrame") );
 
     wxCHECK_MSG( !m_frameToolBar, (wxToolBar *)NULL,
                  wxT("recreating toolbar in wxFrame") );
 

+    if ( style == -1 )
+    {
+        // use default style
+        //
+        // NB: we don't specify the default value in the method declaration
+        //     because
+        //      a) this allows us to have different defaults for different
+        //         platforms (even if we don't have them right now)
+        //      b) we don't need to include wx/toolbar.h in the header then
+        style = wxBORDER_NONE | wxTB_HORIZONTAL | wxTB_FLAT;
+    }
+

     m_frameToolBar = OnCreateToolBar(style, id, name);
 
     return m_frameToolBar;
     m_frameToolBar = OnCreateToolBar(style, id, name);
 
     return m_frameToolBar;


@@ -412,54 +417,56 @@ wxToolBar* wxFrameBase::OnCreateToolBar(long style,
 #endif // wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------

-// Menu UI updating
+// menus

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxFrameBase::OnIdle(wxIdleEvent& WXUNUSED(event) )
-{
-    DoMenuUpdates();
-}
+#if wxUSE_MENUS

 
 // update all menus
 
 // update all menus

-void wxFrameBase::DoMenuUpdates()
+void wxFrameBase::DoMenuUpdates(wxMenu* menu)

 {
 {

+    wxEvtHandler* source = GetEventHandler();

     wxMenuBar* bar = GetMenuBar();
 
     wxMenuBar* bar = GetMenuBar();
 

-    if ( bar != NULL )
+    if (menu)
+        menu->UpdateUI(source);
+    else if ( bar != NULL )

     {
         int nCount = bar->GetMenuCount();
         for (int n = 0; n < nCount; n++)
     {
         int nCount = bar->GetMenuCount();
         for (int n = 0; n < nCount; n++)

-            DoMenuUpdates(bar->GetMenu(n), (wxWindow*) NULL);
+            bar->GetMenu(n)->UpdateUI(source);

     }
 }
 
     }
 }
 

-// update a menu and all submenus recursively
-void wxFrameBase::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))
+void wxFrameBase::DetachMenuBar()

 {
 {

-    wxEvtHandler* evtHandler = GetEventHandler();
-    wxMenuItemList::Node* node = menu->GetMenuItems().GetFirst();
-    while (node)
+    if ( m_frameMenuBar )

     {
     {

-        wxMenuItem* item = node->GetData();
-        if ( !item->IsSeparator() )
-        {
-            wxWindowID id = item->GetId();
-            wxUpdateUIEvent event(id);
-            event.SetEventObject( this );
-
-            if (evtHandler->ProcessEvent(event))
-            {
-                if (event.GetSetText())
-                    menu->SetLabel(id, event.GetText());
-                if (event.GetSetChecked())
-                    menu->Check(id, event.GetChecked());
-                if (event.GetSetEnabled())
-                    menu->Enable(id, event.GetEnabled());
-            }
-
-            if (item->GetSubMenu())
-                DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);
-        }
-        node = node->GetNext();
+        m_frameMenuBar->Detach();
+        m_frameMenuBar = NULL;
+    }
+}
+
+void wxFrameBase::AttachMenuBar(wxMenuBar *menubar)
+{
+    if ( menubar )
+    {
+        menubar->Attach((wxFrame *)this);
+        m_frameMenuBar = menubar;
+    }
+}
+
+void wxFrameBase::SetMenuBar(wxMenuBar *menubar)
+{
+    if ( menubar == GetMenuBar() )
+    {
+        // nothing to do
+        return;

     }
     }

+
+    DetachMenuBar();
+
+    AttachMenuBar(menubar);

 }
 }

+
+#endif // wxUSE_MENUS