multilib mode

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

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index 2ab0ab0fa36abc5b552937aa64255a9cfeb1b4a8..cbf6bf21ee24a0501d9aef1c7ee4672dc29296e8 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -151,7 +151,7 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
 {
     wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
 
 {
     wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
 

-#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && !defined(__WXWINCE__)

     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {
     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {


@@ -250,16 +250,18 @@ void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
 // Implement internal behaviour (menu updating on some platforms)
 void wxFrameBase::OnInternalIdle()
 {
 // Implement internal behaviour (menu updating on some platforms)
 void wxFrameBase::OnInternalIdle()
 {

+    wxTopLevelWindow::OnInternalIdle();
+    

 #if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
     if (wxUpdateUIEvent::CanUpdate(this))
         DoMenuUpdates();
 #endif
 }
 
 #if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
     if (wxUpdateUIEvent::CanUpdate(this))
         DoMenuUpdates();
 #endif
 }
 

-void wxFrameBase::OnMenuOpen(wxMenuEvent& WXUNUSED(event))
+void wxFrameBase::OnMenuOpen(wxMenuEvent& event)

 {
 #if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES
 {
 #if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES

-    DoMenuUpdates();
+    DoMenuUpdates(event.GetMenu());

 #endif
 }
 
 #endif
 }
 


@@ -386,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;


@@ -409,13 +423,15 @@ wxToolBar* wxFrameBase::OnCreateToolBar(long style,
 #if wxUSE_MENUS
 
 // update all menus
 #if wxUSE_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 )

     {
     {

-        wxEvtHandler* source = GetEventHandler();

         int nCount = bar->GetMenuCount();
         for (int n = 0; n < nCount; n++)
             bar->GetMenu(n)->UpdateUI(source);
         int nCount = bar->GetMenuCount();
         for (int n = 0; n < nCount; n++)
             bar->GetMenu(n)->UpdateUI(source);