Added new icon menu

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 68b7c41..0d4cd11 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -169,7 +169,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
        //ignore_blank_lines_flag = 1;
        GetFontProperties();
        
-       if (!m_wndToolBar.Create(this) ||
+       if (!m_wndToolBar.CreateEx(this,TBSTYLE_FLAT,WS_CHILD|WS_VISIBLE|CBRS_GRIPPER|CBRS_TOP|CBRS_TOOLTIPS|CBRS_FLYBY|CBRS_SIZE_DYNAMIC) ||
                !m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
        {
                TRACE0("Failed to create toolbar\n");
@@ -201,6 +201,16 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
        return 0;
 }
 
+
+HMENU CMainFrame::NewDefaultMenu()
+{
+       m_default.LoadMenu(IDR_MAINFRAME);
+       m_default.LoadToolbar(IDR_MAINFRAME);
+       return(m_default.Detach());
+}
+
+
+
 BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
 {
        // TODO: Modify the Window class or styles here by modifying

diff --git a/Src/MainFrm.h b/Src/MainFrm.h
index f1c90b8..48fff1d 100644 (file)
--- a/Src/MainFrm.h
+++ b/Src/MainFrm.h
@@ -28,6 +28,8 @@
 #pragma once
 #endif // _MSC_VER >= 1000
 
+#include "bcmenu.h"
+
 #define BACKUP_FILE_EXT   _T(".bak")
 
 
@@ -91,6 +93,7 @@ public:
        CMergeDoc *m_pMergeDoc;
        CDirDoc *m_pDirDoc;
        virtual ~CMainFrame();
+       HMENU NewDefaultMenu();
 #ifdef _DEBUG
        virtual void AssertValid() const;
        virtual void Dump(CDumpContext& dc) const;
@@ -99,6 +102,7 @@ public:
 protected:  // control bar embedded members
        CStatusBar  m_wndStatusBar;
        CToolBar    m_wndToolBar;
+       BCMenu          m_default;
 
 // Generated message map functions
 protected:

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index f0540fd..fb7344a 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -90,6 +90,8 @@ BOOL CMergeApp::InitInstance()
        SillyTestCrap();
 #endif
 
+//     _CrtSetBreakAlloc( 11481 );
+
        // CCrystalEdit Drag and Drop functionality needs AfxOleInit.
        if(!AfxOleInit())
        {
@@ -152,6 +154,12 @@ BOOL CMergeApp::InitInstance()
                return FALSE;
        m_pMainWnd = pMainFrame;
 
+       pMainFrame->m_hMenuDefault=pMainFrame->NewDefaultMenu();
+
+       // This simulates a window being opened if you don't have
+       // a default window displayed at startup
+       pMainFrame->OnUpdateFrameMenu(pMainFrame->m_hMenuDefault);
+
        // Parse command line for standard shell commands, DDE, file open
        //CCommandLineInfo cmdInfo;
        //ParseCommandLine(cmdInfo);

diff --git a/Src/Merge.dsp b/Src/Merge.dsp
index e36aa4d..143cb94 100644 (file)
--- a/Src/Merge.dsp
+++ b/Src/Merge.dsp
@@ -114,6 +114,10 @@ SOURCE=.\ANALYZE.C
 # End Source File
 # Begin Source File
 
+SOURCE=.\BCMenu.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\CCPrompt.cpp
 # End Source File
 # Begin Source File
@@ -580,6 +584,10 @@ SOURCE=D:\data\html\WinMergeChanges.html
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
+SOURCE=.\BCMenu.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\CCPrompt.h
 # End Source File
 # Begin Source File