Update of /cvsroot/cpptool/rfta/src/rftavc7addin
In directory sc8-pr-cvs1:/tmp/cvs-serv10170/src/rftavc7addin
Modified Files:
Connect.cpp Connect.h
Log Message:
* changed menu name
* renamed command bar creation method
Index: Connect.cpp
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/Connect.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Connect.cpp 18 May 2003 09:19:10 -0000 1.8
--- Connect.cpp 18 May 2003 18:32:38 -0000 1.9
***************
*** 51,56 ****
AFX_MANAGE_STATE(AfxGetStaticModuleState());
- _asm int 3; // comment this out to force an assertion when loading the add-in.
-
HRESULT hr = S_OK;
pApplication->QueryInterface(__uuidof(EnvDTE::_DTE), (LPVOID*)&m_pDTE);
--- 51,54 ----
***************
*** 59,62 ****
--- 57,62 ----
return S_OK;
+ // _asm int 3; // comment this out to force an assertion when loading the add-in.
+
try
{
***************
*** 100,110 ****
IDB_REDUCELOCALEVARIABLESCOPE );
*/
! CComPtr<Office::CommandBar> pToolBar = ensureToolBarExist( *pCommands,
! L"C++ Refactoring Assistant",
! EnvDTE::vsCommandBarTypeToolbar );
! CComPtr<Office::CommandBar> pMenuBar = ensureToolBarExist( *pCommands,
! L"Refactoring",
! EnvDTE::vsCommandBarTypeMenu );
int index = 1;
--- 100,110 ----
IDB_REDUCELOCALEVARIABLESCOPE );
*/
! CComPtr<Office::CommandBar> pToolBar = ensureCommandBarExist( *pCommands,
! L"C++ Refactoring Assistant",
! EnvDTE::vsCommandBarTypeToolbar );
! CComPtr<Office::CommandBar> pMenuBar = ensureCommandBarExist( *pCommands,
! L"C++ Refactoring",
! EnvDTE::vsCommandBarTypeMenu );
int index = 1;
***************
*** 149,162 ****
CComPtr<Office::CommandBar>
! CConnect::ensureToolBarExist( EnvDTE::Commands &commands,
const CComBSTR &toolBarName,
EnvDTE::vsCommandBarType commandBarType )
{
! CComQIPtr<Office::CommandBar> pToolbar;
CComPtr<Office::_CommandBars> pCommandBars;
VERIFY_COM( m_pDTE->get_CommandBars( &pCommandBars ) );
! HRESULT hr = pCommandBars->get_Item( CComVariant( toolBarName ), &pToolbar );
if ( SUCCEEDED(hr) ) // the toolbar already exist, make it visible
! pToolbar->put_Visible(VARIANT_TRUE);
else // the toolbar has not been created yet
{
--- 149,162 ----
CComPtr<Office::CommandBar>
! CConnect::ensureCommandBarExist( EnvDTE::Commands &commands,
const CComBSTR &toolBarName,
EnvDTE::vsCommandBarType commandBarType )
{
! CComQIPtr<Office::CommandBar> pCommandBar;
CComPtr<Office::_CommandBars> pCommandBars;
VERIFY_COM( m_pDTE->get_CommandBars( &pCommandBars ) );
! HRESULT hr = pCommandBars->get_Item( CComVariant( toolBarName ), &pCommandBar );
if ( SUCCEEDED(hr) ) // the toolbar already exist, make it visible
! pCommandBar->put_Visible(VARIANT_TRUE);
else // the toolbar has not been created yet
{
***************
*** 171,181 ****
4,
&pDisp ) );
! pToolbar = pDisp; // returned object is not a Office::CommandBar
! if ( pToolbar == NULL )
throw IDTCallError( E_FAIL );
! pToolbar->put_Visible(VARIANT_TRUE);
}
! return pToolbar;
}
--- 171,181 ----
4,
&pDisp ) );
! pCommandBar = pDisp; // returned object is not a Office::CommandBar
! if ( pCommandBar == NULL )
throw IDTCallError( E_FAIL );
! pCommandBar->put_Visible(VARIANT_TRUE);
}
! return pCommandBar;
}
Index: Connect.h
===================================================================
RCS file: /cvsroot/cpptool/rfta/src/rftavc7addin/Connect.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Connect.h 14 May 2003 18:55:50 -0000 1.3
--- Connect.h 18 May 2003 18:32:39 -0000 1.4
***************
*** 82,88 ****
int commandBitmapID );
! CComPtr<Office::CommandBar> ensureToolBarExist( EnvDTE::Commands &commands,
! const CComBSTR &toolBarName,
! EnvDTE::vsCommandBarType commandBarType );
void associateCommand( const CComPtr<EnvDTE::Command> &pCommand,
--- 82,88 ----
int commandBitmapID );
! CComPtr<Office::CommandBar> ensureCommandBarExist( EnvDTE::Commands &commands,
! const CComBSTR &toolBarName,
! EnvDTE::vsCommandBarType commandBarType );
void associateCommand( const CComPtr<EnvDTE::Command> &pCommand,
|
