Applied patch [ 1204548 ] Add Get and SetVolume to wxMediaCtrl and fix bug 1200182

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

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index f45162744039db5c8ff5565ec9f1aed1e56c4534..ae37a7fbd87e286eb8229e579461146c443053ae 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -155,8 +155,7 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
 {
     wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
 
 {
     wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
 

-#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && \
-  (!defined(__WXWINCE__) || (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP)))
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)

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


@@ -177,6 +176,15 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

+
+void wxFrameBase::SendSizeEvent()
+{
+    wxSizeEvent event( GetSize(), GetId() );
+    event.SetEventObject( this );
+    GetEventHandler()->AddPendingEvent( event );
+}
+
+

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


@@ -197,6 +205,9 @@ bool wxFrameBase::ProcessCommand(int id)
         if (!item->IsEnabled())
             return true;
 
         if (!item->IsEnabled())
             return true;
 

+        if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() )
+            return true;
+

         if (item->IsCheckable())
         {
             item->Toggle();
         if (item->IsCheckable())
         {
             item->Toggle();


@@ -219,7 +230,7 @@ bool wxFrameBase::ProcessCommand(int id)
 void wxFrameBase::UpdateWindowUI(long flags)
 {
     wxWindowBase::UpdateWindowUI(flags);
 void wxFrameBase::UpdateWindowUI(long flags)
 {
     wxWindowBase::UpdateWindowUI(flags);

-    
+

 #if wxUSE_TOOLBAR
     if (GetToolBar())
         GetToolBar()->UpdateWindowUI(flags);
 #if wxUSE_TOOLBAR
     if (GetToolBar())
         GetToolBar()->UpdateWindowUI(flags);


@@ -268,7 +279,7 @@ void wxFrameBase::OnMenuOpen(wxMenuEvent& WXUNUSED(event))
 void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event))
 {
     // do we have real status text to restore?
 void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event))
 {
     // do we have real status text to restore?

-    if ( m_oldStatusText.length() > 1 || m_oldStatusText[0u] )
+    if ( !m_oldStatusText.empty() )

     {
         if ( m_statusBarPane >= 0 )
         {
     {
         if ( m_statusBarPane >= 0 )
         {


@@ -287,7 +298,7 @@ void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event))
 void wxFrameBase::OnInternalIdle()
 {
     wxTopLevelWindow::OnInternalIdle();
 void wxFrameBase::OnInternalIdle()
 {
     wxTopLevelWindow::OnInternalIdle();

-    
+

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


@@ -310,9 +321,7 @@ wxStatusBar* wxFrameBase::CreateStatusBar(int number,
     wxCHECK_MSG( !m_frameStatusBar, (wxStatusBar *)NULL,
                  wxT("recreating status bar in wxFrame") );
 
     wxCHECK_MSG( !m_frameStatusBar, (wxStatusBar *)NULL,
                  wxT("recreating status bar in wxFrame") );
 

-    m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
-    if ( m_frameStatusBar )
-        PositionStatusBar();
+    SetStatusBar(OnCreateStatusBar(number, style, id, name));

 
     return m_frameStatusBar;
 }
 
     return m_frameStatusBar;
 }


@@ -381,12 +390,25 @@ bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
 
     DoGiveHelp(helpString, show);
 
 
     DoGiveHelp(helpString, show);
 

-    return !helpString.IsEmpty();
+    return !helpString.empty();

 #else // !wxUSE_MENUS
     return false;
 #endif // wxUSE_MENUS/!wxUSE_MENUS
 }
 
 #else // !wxUSE_MENUS
     return false;
 #endif // wxUSE_MENUS/!wxUSE_MENUS
 }
 

+void wxFrameBase::SetStatusBar(wxStatusBar *statBar)
+{
+    bool hadBar = m_frameStatusBar != NULL;
+    m_frameStatusBar = statBar;
+
+    if ( (m_frameStatusBar != NULL) != hadBar )
+    {
+        PositionStatusBar();
+
+        DoLayout();
+    }
+}
+

 #endif // wxUSE_STATUSBAR
 
 void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
 #endif // wxUSE_STATUSBAR
 
 void wxFrameBase::DoGiveHelp(const wxString& text, bool show)


@@ -427,6 +449,9 @@ void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
     }
 
     statbar->SetStatusText(help, m_statusBarPane);
     }
 
     statbar->SetStatusText(help, m_statusBarPane);

+#else
+    wxUnusedVar(text);
+    wxUnusedVar(show);

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


@@ -458,7 +483,7 @@ wxToolBar* wxFrameBase::CreateToolBar(long style,
         style = wxBORDER_NONE | wxTB_HORIZONTAL | wxTB_FLAT;
     }
 
         style = wxBORDER_NONE | wxTB_HORIZONTAL | wxTB_FLAT;
     }
 

-    m_frameToolBar = OnCreateToolBar(style, id, name);
+    SetToolBar(OnCreateToolBar(style, id, name));

 
     return m_frameToolBar;
 }
 
     return m_frameToolBar;
 }


@@ -467,9 +492,28 @@ wxToolBar* wxFrameBase::OnCreateToolBar(long style,
                                         wxWindowID id,
                                         const wxString& name)
 {
                                         wxWindowID id,
                                         const wxString& name)
 {

+#if defined(__WXWINCE__) && defined(__POCKETPC__)
+    return new wxToolMenuBar(this, id,
+                         wxDefaultPosition, wxDefaultSize,
+                         style, name);
+#else

     return new wxToolBar(this, id,
                          wxDefaultPosition, wxDefaultSize,
                          style, name);
     return new wxToolBar(this, id,
                          wxDefaultPosition, wxDefaultSize,
                          style, name);

+#endif
+}
+
+void wxFrameBase::SetToolBar(wxToolBar *toolbar)
+{
+    bool hadBar = m_frameToolBar != NULL;
+    m_frameToolBar = toolbar;
+
+    if ( (m_frameToolBar != NULL) != hadBar )
+    {
+        PositionToolBar();
+
+        DoLayout();
+    }

 }
 
 #endif // wxUSE_TOOLBAR
 }
 
 #endif // wxUSE_TOOLBAR


@@ -528,3 +572,12 @@ void wxFrameBase::SetMenuBar(wxMenuBar *menubar)
 }
 
 #endif // wxUSE_MENUS
 }
 
 #endif // wxUSE_MENUS

+
+#if WXWIN_COMPATIBILITY_2_2
+
+bool wxFrameBase::Command(int winid)
+{
+    return ProcessCommand(winid);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_2