From: <td...@us...> - 2003-07-31 08:57:57
|
Update of /cvsroot/anyedit/AnyEditv2 In directory sc8-pr-cvs1:/tmp/cvs-serv1327 Modified Files: AnyEdit.dsp AnyEdit.rc ClassView.cpp MainFrm.cpp OutputBar.cpp resource.h Log Message: Fixed Office XP look issues.. Index: AnyEdit.dsp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.dsp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AnyEdit.dsp 23 Jul 2003 09:41:34 -0000 1.19 --- AnyEdit.dsp 31 Jul 2003 08:57:48 -0000 1.20 *************** *** 396,399 **** --- 396,415 ---- # Begin Source File + SOURCE=.\LBSpinButtonCtrl.cpp + # End Source File + # Begin Source File + + SOURCE=.\LBSpinButtonCtrl.h + # End Source File + # Begin Source File + + SOURCE=.\LBTabCtrl.cpp + # End Source File + # Begin Source File + + SOURCE=.\LBTabCtrl.h + # End Source File + # Begin Source File + SOURCE=.\Plugin.cpp # End Source File *************** *** 1257,1260 **** --- 1273,1280 ---- SOURCE=.\res\bmp00021.bmp + # End Source File + # Begin Source File + + SOURCE=.\res\bmp00022.bmp # End Source File # Begin Source File Index: AnyEdit.rc =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/AnyEdit.rc,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** AnyEdit.rc 23 Jul 2003 09:41:34 -0000 1.24 --- AnyEdit.rc 31 Jul 2003 08:57:48 -0000 1.25 *************** *** 913,916 **** --- 913,932 ---- END + IDR_MENU1 MENU DISCARDABLE + BEGIN + POPUP "File" + BEGIN + MENUITEM "Ohohohoh", ID_FILE_OHOHOHOH + END + POPUP "Tools" + BEGIN + MENUITEM "dingdong", ID_TOOLS_DINGDONG + END + POPUP "newguy" + BEGIN + MENUITEM "wlkjljlj", ID_NEWGUY_WLKJLJLJ + END + END + #ifdef APSTUDIO_INVOKED *************** *** 1000,1003 **** --- 1016,1020 ---- IDR_FULLSCREEN BITMAP DISCARDABLE "res\\bmp00020.bmp" IDR_VIEW BITMAP DISCARDABLE "res\\bmp00021.bmp" + IDB_OUTBAR BITMAP DISCARDABLE "res\\bmp00022.bmp" ///////////////////////////////////////////////////////////////////////////// Index: ClassView.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/ClassView.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ClassView.cpp 8 May 2003 12:00:56 -0000 1.16 --- ClassView.cpp 31 Jul 2003 08:57:48 -0000 1.17 *************** *** 52,55 **** --- 52,56 ---- // to avoid memory leaks when closing the AnyEdit app, CTagEntry classes (that are pointed to by GetItemData // are deleted on WM_DESTROY (OnDestoy function); + if(m_SingleLock) delete m_SingleLock; } Index: MainFrm.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/MainFrm.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** MainFrm.cpp 23 Jul 2003 09:41:34 -0000 1.25 --- MainFrm.cpp 31 Jul 2003 08:57:48 -0000 1.26 *************** *** 213,217 **** ! if (!m_wndFullScreen.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || !m_wndFullScreen.LoadToolBar(IDR_FULLSCREEN)) --- 213,217 ---- ! if (!m_wndFullScreen.CreateEx(this, TBSTYLE_TRANSPARENT|TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || !m_wndFullScreen.LoadToolBar(IDR_FULLSCREEN)) *************** *** 221,225 **** } ! if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || !m_wndToolBar.LoadToolBar(IDR_MAINFRAME)) --- 221,225 ---- } ! if (!m_wndToolBar.CreateEx(this, TBSTYLE_TRANSPARENT|TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || !m_wndToolBar.LoadToolBar(IDR_MAINFRAME)) *************** *** 229,233 **** } ! if (!m_wndToolbarFormat.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || !m_wndToolbarFormat.LoadToolBar(IDR_FORMAT)) --- 229,233 ---- } ! if (!m_wndToolbarFormat.CreateEx(this, TBSTYLE_TRANSPARENT|TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || !m_wndToolbarFormat.LoadToolBar(IDR_FORMAT)) Index: OutputBar.cpp =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/OutputBar.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** OutputBar.cpp 17 Jul 2003 11:32:15 -0000 1.9 --- OutputBar.cpp 31 Jul 2003 08:57:48 -0000 1.10 *************** *** 88,92 **** // Create tabs window: ! if (!m_wndTabs.Create (CBCGTabWnd::STYLE_FLAT_SHARED_HORZ_SCROLL, rectClient, this, 101)) { --- 88,92 ---- // Create tabs window: ! if (!m_wndTabs.Create (CBCGTabWnd::STYLE_3D, rectClient, this, 101)) { *************** *** 95,98 **** --- 95,100 ---- } + m_wndTabs.SetImageList (IDB_OUTBAR, 16, RGB (255, 0, 0)); + // Create output panes: *************** *** 124,131 **** // Attach views to tab: ! m_wndTabs.AddTab (&m_wndOutputBuild, _T("Build"), -1); ! m_wndTabs.AddTab (&m_wndOutputOutput, _T("Output"), -1); ! m_wndTabs.AddTab (&m_wndOutputFind1, _T("Find in Files 1"), -1); ! m_wndTabs.AddTab (&m_wndOutputFind2, _T("Find in Files 2"), -1); return 0; --- 126,133 ---- // Attach views to tab: ! m_wndTabs.AddTab (&m_wndOutputBuild, _T("Build"), 0); ! m_wndTabs.AddTab (&m_wndOutputOutput, _T("Output"), 1); ! m_wndTabs.AddTab (&m_wndOutputFind1, _T("Find in Files 1"), 2); ! m_wndTabs.AddTab (&m_wndOutputFind2, _T("Find in Files 2"), 3); return 0; Index: resource.h =================================================================== RCS file: /cvsroot/anyedit/AnyEditv2/resource.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** resource.h 23 Jul 2003 09:41:34 -0000 1.16 --- resource.h 31 Jul 2003 08:57:48 -0000 1.17 *************** *** 103,107 **** --- 103,109 ---- #define IDR_POPUP_PLUGINS 249 #define IDI_ICON1 250 + #define IDR_MENU1 250 #define IDD_DIALOG2 251 + #define IDB_OUTBAR 251 #define IDR_VIEW 252 #define IDD_WIN2K_FILEDIALOG 446 *************** *** 423,426 **** --- 425,456 ---- #define ID_CONFIGURE_CURRENTDOCUMENT_BOOKMARKMARGIN 33041 #define ID_CONFIGURE_CURRENTDOCUMENT_FOLDMARGIN 33044 + #define ID_PLUGINS_PLUGIN1 33045 + #define ID_PLUGINS_PLUGIN2 33046 + #define ID_PLUGINS_PLUGIN3 33047 + #define ID_PLUGINS_PLUGIN4 33048 + #define ID_PLUGINS_PLUGIN5 33049 + #define ID_PLUGINS_PLUGIN6 33050 + #define ID_PLUGINS_PLUGIN7 33051 + #define ID_PLUGINS_PLUGIN8 33052 + #define ID_PLUGINS_PLUGIN9 33053 + #define ID_PLUGINS_PLUGIN10 33054 + #define ID_PLUGINS_PLUGIN11 33055 + #define ID_PLUGINS_PLUGIN12 33056 + #define ID_PLUGINS_PLUGIN13 33057 + #define ID_PLUGINS_PLUGIN14 33058 + #define ID_PLUGINS_PLUGIN15 33059 + #define ID_PLUGINS_PLUGIN16 33060 + #define ID_PLUGINS_PLUGIN17 33061 + #define ID_PLUGINS_PLUGIN18 33062 + #define ID_PLUGINS_PLUGIN19 33063 + #define ID_PLUGINS_PLUGIN20 33064 + #define ID_PLUGINS_PLUGIN21 33065 + #define ID_PLUGINS_PLUGIN22 33066 + #define ID_PLUGINS_PLUGIN23 33067 + #define ID_PLUGINS_PLUGIN24 33068 + #define ID_PLUGINS_PLUGIN25 33069 + #define ID_FILE_OHOHOHOH 33070 + #define ID_TOOLS_DINGDONG 33071 + #define ID_NEWGUY_WLKJLJLJ 33072 #define ID_OUTPUT_CLEAR 57632 #define ID_OUTPUT_COPY 57634 *************** *** 437,442 **** #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 ! #define _APS_NEXT_RESOURCE_VALUE 250 ! #define _APS_NEXT_COMMAND_VALUE 33070 #define _APS_NEXT_CONTROL_VALUE 1088 #define _APS_NEXT_SYMED_VALUE 105 --- 467,472 ---- #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_3D_CONTROLS 1 ! #define _APS_NEXT_RESOURCE_VALUE 252 ! #define _APS_NEXT_COMMAND_VALUE 33073 #define _APS_NEXT_CONTROL_VALUE 1088 #define _APS_NEXT_SYMED_VALUE 105 |