BUG: [ 2015174 ] Insert-/Update mode is not shown

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 41f364e..8a19d42 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -11,6 +11,7 @@ WinMerge 2.11.1.1
   New option to enable plugins (disabled by default) (#2013845)
   BugFix: Use system codepage for paths (#1979429, #2008581)
   BugFix: ANSI build crash in folder compare (#2010053)
+  BugFix: Add insert/overtype mode indicator to statusbar (#2015174)
 
 WinMerge 2.10.x (R2_10) branch created (r5561)
 

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 7b6a6c7..18e9fdf 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -222,14 +222,14 @@ END_MESSAGE_MAP()
 /**
  * @brief MainFrame statusbar panels/indicators
  */
-static UINT indicators[] =
+static UINT StatusbarIndicators[] =
 {
        ID_SEPARATOR,           // status line indicator
        ID_SEPARATOR,           // Merge mode
        ID_SEPARATOR,           // Diff number
-       ID_INDICATOR_CAPS,
-       ID_INDICATOR_NUM,
-       ID_INDICATOR_SCRL,
+       ID_INDICATOR_CAPS,      // Caps Lock
+       ID_INDICATOR_NUM,       // Num Lock
+       ID_INDICATOR_OVR,       // Insert
 };
 
 /** @brief Timer ID for window flashing timer. */
@@ -405,8 +405,9 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
                TRACE0("Failed to create status bar\n");
                return -1;      // fail to create
        }
-       theApp.SetIndicators(m_wndStatusBar, indicators, sizeof(indicators)/sizeof(UINT));
-       
+       theApp.SetIndicators(m_wndStatusBar, StatusbarIndicators,
+                       countof(StatusbarIndicators));
+
        m_wndStatusBar.SetPaneInfo(1, ID_STATUS_MERGINGMODE, 0, 100); 
        m_wndStatusBar.SetPaneInfo(2, ID_STATUS_DIFFNUM, 0, 150); 
        if (GetOptionsMgr()->GetBool(OPT_SHOW_STATUSBAR) == false)