Ticket #7247: update-statusbar-when-theme-changes.patch

src/interface/Mainfrm.cpp

@@ -304 +304 @@
     // so that contextchange events can be processed in the right order.
     m_pContextControl = new CContextControl(this);
 
-    m_pStatusBar = new CStatusBar(this);
-    if (m_pStatusBar)
-    {
-        m_pActivityLed[0] = new CLed(m_pStatusBar, 0);
-        m_pActivityLed[1] = new CLed(m_pStatusBar, 1);
+    CreateStatusBar();
 
-        m_pStatusBar->AddField(-1, widget_led_recv, m_pActivityLed[1]);
-        m_pStatusBar->AddField(-1, widget_led_send, m_pActivityLed[0]);
-
-        SetStatusBar(m_pStatusBar);
-    }
-
     m_closeEventTimer.SetOwner(this);
 
     if (CFilterManager::HasActiveFilters(true))
@@ -531 +521 @@
 #endif
 }
 
+bool CMainFrame::CreateStatusBar() {
+    
+    wxGetApp().AddStartupProfileRecord(_T("CMainFrame::CreateMenus"));
+    if (m_pStatusBar)
+    {
+        SetStatusBar(0);
+        delete m_pStatusBar;
+        m_pStatusBar = 0;
+    }
+
+    m_pStatusBar = new CStatusBar(this);
+    if (m_pStatusBar)
+    {
+        m_pActivityLed[0] = new CLed(m_pStatusBar, 0);
+        m_pActivityLed[1] = new CLed(m_pStatusBar, 1);
+
+        m_pStatusBar->AddField(-1, widget_led_recv, m_pActivityLed[1]);
+        m_pStatusBar->AddField(-1, widget_led_send, m_pActivityLed[0]);
+
+        SetStatusBar(m_pStatusBar);
+    }
+
+    return true;
+}
+
 bool CMainFrame::CreateMenus()
 {
     wxGetApp().AddStartupProfileRecord(_T("CMainFrame::CreateMenus"));
@@ -1574 +1589 @@
         CreateMainToolBar();
         if (m_pToolBar)
             m_pToolBar->UpdateToolbarState();
+        CreateStatusBar();
     }
 
     if (oldLang != newLang ||

src/interface/Mainfrm.h

@@ -74 +74 @@
     void FixTabOrder();
 
     bool CloseDialogsAndQuit(wxCloseEvent &event);
+    bool CreateStatusBar();
     bool CreateMenus();
     bool CreateQuickconnectBar();
     bool CreateMainToolBar();