[GME-commit]
GMESRC/GME/GMEActiveBrowser GMEActiveBrowser.vcproj,NONE,1.1
ActiveBrowserPropertyPage.cpp,1.40,1.41
AggregateContextMenu.cpp,1.20,1.21 AggregateTreeCtrl.cpp,1.21,1.22
GMEActiveBrowser.def,1.1,1.2 GMEActiveBrowser.rc,1.11,1.12
StdAfx.cpp,1.1,1.2 StdAfx.h,1.3,1.4 TreeCtrlEx.cpp,1.4,1.5
resource.h,1.7,1.8 GMEActiveBrowser.dsp,1.14,NONE
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Jan 26 11:31:32 CST 2005
- Previous message: [GME-commit] GMESRC/GME/Mga Mga.vcproj,NONE,1.1 Mga.cpp,1.11,1.12
Mga.def,1.1,1.2 MgaAttribute.cpp,1.14,1.15 MgaAttribute.h,1.5,1.6
MgaCheck.cpp,1.6,1.7 MgaComplexOps.cpp,1.9,1.10
MgaConnection.cpp,1.16,1.17 MgaConnection.h,1.6,1.7
MgaConstraint.cpp,1.5,1.6 MgaConstraint.h,1.3,1.4
MgaCoreObj.h,1.3,1.4 MgaFCO.cpp,1.33,1.34 MgaFCO.h,1.20,1.21
MgaFilter.cpp,1.8,1.9 MgaFilter.h,1.6,1.7 MgaFolder.cpp,1.26,1.27
MgaFolder.h,1.6,1.7 MgaLib.idl,1.9,1.10 MgaModel.h,1.4,1.5
MgaProject.cpp,1.61,1.62 MgaReference.cpp,1.9,1.10
MgaReference.h,1.5,1.6 MgaSet.cpp,1.10,1.11 MgaSet.h,1.6,1.7
MgaTrukk.h,1.19,1.20 StdAfx.cpp,1.1,1.2 Mga.dsp,1.26,NONE
- Next message: [GME-commit] GMESRC/GME/Gme/AutoRoute ArGraph.cpp,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/lib/gme/GMESRC/GME/GMEActiveBrowser
In directory braindrain:/tmp/cvs-serv19193/GME/GMEActiveBrowser
Modified Files:
ActiveBrowserPropertyPage.cpp AggregateContextMenu.cpp
AggregateTreeCtrl.cpp GMEActiveBrowser.def GMEActiveBrowser.rc
StdAfx.cpp StdAfx.h TreeCtrlEx.cpp resource.h
Added Files:
GMEActiveBrowser.vcproj
Removed Files:
GMEActiveBrowser.dsp
Log Message:
Checkin for VC7.1 upgrade
CVS User: zolmol
--- NEW FILE: GMEActiveBrowser.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="GMEActiveBrowser"
SccProjectName=""
SccLocalPath=""
Keyword="MFCProj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="2"
UseOfMFC="2"
[...1019 lines suppressed...]
<File
RelativePath="libIco.ico">
</File>
<File
RelativePath="Library.ico">
</File>
<File
RelativePath="MetaIco.bmp">
</File>
<File
RelativePath="StateIco.bmp">
</File>
</Filter>
<File
RelativePath="ReadMe.txt">
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Index: ActiveBrowserPropertyPage.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/ActiveBrowserPropertyPage.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ActiveBrowserPropertyPage.cpp 19 Jan 2005 23:47:23 -0000 1.40
--- ActiveBrowserPropertyPage.cpp 26 Jan 2005 17:28:25 -0000 1.41
***************
*** 2528,2532 ****
COMTHROW(ccpMgaObject->get_Name(&pDisplayedName));
! return pDisplayedName;
}
--- 2528,2534 ----
COMTHROW(ccpMgaObject->get_Name(&pDisplayedName));
! CString ret = pDisplayedName;
!
! return ret;
}
***************
*** 3379,3385 ****
COMTHROW(ccpMgaMetaBase->get_DisplayedName(&pDisplayedName));
! return pDisplayedName;
!
!
}
--- 3381,3387 ----
COMTHROW(ccpMgaMetaBase->get_DisplayedName(&pDisplayedName));
! CString ret = pDisplayedName;
!
! return ret;
}
Index: AggregateContextMenu.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/AggregateContextMenu.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** AggregateContextMenu.cpp 5 Jan 2005 19:58:11 -0000 1.20
--- AggregateContextMenu.cpp 26 Jan 2005 17:28:25 -0000 1.21
***************
*** 361,366 ****
{
if(!m_pParent->m_TreeAggregate.DoDropWithoutChecking(DRAGOP_COPY,&OleDataObject,CPoint(0,0)))
! {
! m_pParent->MessageBox("Cannot paste data from the clipboard. Please select valid target item.","Paste Error",MB_ICONERROR);
}
}
--- 361,366 ----
{
if(!m_pParent->m_TreeAggregate.DoDropWithoutChecking(DRAGOP_COPY,&OleDataObject,CPoint(0,0)))
! {
! m_pParent->MessageBox("Cannot paste data from the clipboard. Please select valid target item.","Paste Error",MB_ICONERROR);
}
}
Index: AggregateTreeCtrl.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/AggregateTreeCtrl.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** AggregateTreeCtrl.cpp 5 Jan 2005 19:58:12 -0000 1.21
--- AggregateTreeCtrl.cpp 26 Jan 2005 17:28:25 -0000 1.22
***************
*** 59,63 ****
CAggregatePropertyPage* pParent=(CAggregatePropertyPage*)GetParent();
! int sourceControlImageOffset = 0;
if(pParent->m_Options.m_bIsDynamicLoading)
--- 59,63 ----
CAggregatePropertyPage* pParent=(CAggregatePropertyPage*)GetParent();
! int sourceControlImageOffset = 0;
if(pParent->m_Options.m_bIsDynamicLoading)
***************
*** 68,72 ****
CComQIPtr<IMgaObject> ccpMgaObject(pUnknown);
tvInsert.item.cChildren=pParent->reqHasDisplayedChild(ccpMgaObject);
! sourceControlImageOffset = pParent->GetSourceControlStateOffset(ccpMgaObject);
}
else
--- 68,72 ----
CComQIPtr<IMgaObject> ccpMgaObject(pUnknown);
tvInsert.item.cChildren=pParent->reqHasDisplayedChild(ccpMgaObject);
! sourceControlImageOffset = pParent->GetSourceControlStateOffset(ccpMgaObject);
}
else
***************
*** 140,144 ****
CAggregatePropertyPage* pParent=(CAggregatePropertyPage*)GetParent();
! int sourceControlImageOffset = 0;
if(pParent->m_Options.m_bIsDynamicLoading)
--- 140,144 ----
CAggregatePropertyPage* pParent=(CAggregatePropertyPage*)GetParent();
! int sourceControlImageOffset = 0;
if(pParent->m_Options.m_bIsDynamicLoading)
***************
*** 149,153 ****
CComQIPtr<IMgaObject> ccpMgaObject(pUnknown);
tvInsert.item.cChildren=pParent->reqHasDisplayedChild(ccpMgaObject);
! sourceControlImageOffset = pParent->GetSourceControlStateOffset(ccpMgaObject);
}
else
--- 149,153 ----
CComQIPtr<IMgaObject> ccpMgaObject(pUnknown);
tvInsert.item.cChildren=pParent->reqHasDisplayedChild(ccpMgaObject);
! sourceControlImageOffset = pParent->GetSourceControlStateOffset(ccpMgaObject);
}
else
Index: GMEActiveBrowser.def
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/GMEActiveBrowser.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GMEActiveBrowser.def 1 Mar 2002 21:53:00 -0000 1.1
--- GMEActiveBrowser.def 26 Jan 2005 17:28:25 -0000 1.2
***************
*** 4,9 ****
EXPORTS
! DllCanUnloadNow @1 PRIVATE
! DllGetClassObject @2 PRIVATE
! DllRegisterServer @3 PRIVATE
! DllUnregisterServer @4 PRIVATE
--- 4,9 ----
EXPORTS
! DllCanUnloadNow PRIVATE
! DllGetClassObject PRIVATE
! DllRegisterServer PRIVATE
! DllUnregisterServer PRIVATE
Index: GMEActiveBrowser.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/GMEActiveBrowser.rc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** GMEActiveBrowser.rc 12 Jan 2005 18:04:27 -0000 1.11
--- GMEActiveBrowser.rc 26 Jan 2005 17:28:25 -0000 1.12
***************
*** 1,3 ****
! //Microsoft Developer Studio generated resource script.
//
#include "resource.h"
--- 1,3 ----
! // Microsoft Visual C++ generated resource script.
//
#include "resource.h"
***************
*** 28,37 ****
//
! 1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
! 2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
--- 28,37 ----
//
! 1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
! 2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
***************
*** 39,43 ****
END
! 3 TEXTINCLUDE DISCARDABLE
BEGIN
"1 TYPELIB ""GMEActiveBrowser.tlb""\r\n"
--- 39,43 ----
END
! 3 TEXTINCLUDE
BEGIN
"1 TYPELIB ""GMEActiveBrowser.tlb""\r\n"
***************
*** 48,52 ****
- #ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
--- 48,51 ----
***************
*** 71,84 ****
BLOCK "040904B0"
BEGIN
! VALUE "CompanyName", "Vanderbilt\0"
! VALUE "FileDescription", "GMEActiveBrowser ActiveX Control Module\0"
! VALUE "FileVersion", "1, 0, 0, 1\0"
! VALUE "InternalName", "GMEActiveBrowser\0"
! VALUE "LegalCopyright", "Copyright (C) 2001\0"
! VALUE "LegalTrademarks", "\0"
! VALUE "OriginalFilename", "GMEActiveBrowser.OCX\0"
! VALUE "ProductName", "GMEActiveBrowser ActiveX Control Module\0"
! VALUE "ProductVersion", "1, 0, 0, 1\0"
! VALUE "OLESelfRegister", "\0"
END
END
--- 70,81 ----
BLOCK "040904B0"
BEGIN
! VALUE "CompanyName", "Vanderbilt"
! VALUE "FileDescription", "GMEActiveBrowser ActiveX Control Module"
! VALUE "FileVersion", "1, 0, 0, 1"
! VALUE "InternalName", "GMEActiveBrowser"
! VALUE "LegalCopyright", "Copyright (C) 2001"
! VALUE "OriginalFilename", "GMEActiveBrowser.OCX"
! VALUE "ProductName", "GMEActiveBrowser ActiveX Control Module"
! VALUE "ProductVersion", "1, 0, 0, 1"
END
END
***************
*** 89,94 ****
END
- #endif // !_MAC
-
/////////////////////////////////////////////////////////////////////////////
--- 86,89 ----
***************
*** 97,106 ****
//
! IDB_GMEACTIVEBROWSER BITMAP DISCARDABLE "GMEActiveBrowserCtl.bmp"
! IDB_IMAGELIST_AGGREGATE BITMAP DISCARDABLE "AggIco.bmp"
! IDB_IMAGELIST_INHERITANCE BITMAP DISCARDABLE "InhIco.bmp"
! IDB_IMAGELIST_META BITMAP DISCARDABLE "MetaIco.bmp"
! IDB_SEARCH BITMAP DISCARDABLE "IcoFind.bmp"
! IDB_IMAGELIST_AGGREGATE_STATE BITMAP DISCARDABLE "StateIco.bmp"
/////////////////////////////////////////////////////////////////////////////
--- 92,101 ----
//
! IDB_GMEACTIVEBROWSER BITMAP "GMEActiveBrowserCtl.bmp"
! IDB_IMAGELIST_AGGREGATE BITMAP "AggIco.bmp"
! IDB_IMAGELIST_INHERITANCE BITMAP "InhIco.bmp"
! IDB_IMAGELIST_META BITMAP "MetaIco.bmp"
! IDB_SEARCH BITMAP "IcoFind.bmp"
! IDB_IMAGELIST_AGGREGATE_STATE BITMAP "StateIco.bmp"
/////////////////////////////////////////////////////////////////////////////
***************
*** 109,114 ****
//
! IDD_PROPPAGE_GMEACTIVEBROWSER DIALOG DISCARDABLE 0, 0, 250, 62
! STYLE WS_CHILD
FONT 8, "MS Sans Serif"
BEGIN
--- 104,109 ----
//
! IDD_PROPPAGE_GMEACTIVEBROWSER DIALOG 0, 0, 250, 62
! STYLE DS_SETFONT | WS_CHILD
FONT 8, "MS Sans Serif"
BEGIN
***************
*** 116,121 ****
END
! IDD_PROPPAGE_META DIALOG DISCARDABLE 0, 0, 183, 285
! STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Meta"
FONT 8, "MS Sans Serif"
--- 111,116 ----
END
! IDD_PROPPAGE_META DIALOG 0, 0, 183, 285
! STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Meta"
FONT 8, "MS Sans Serif"
***************
*** 127,132 ****
END
! IDD_PROPPAGE_INHERITANCE DIALOG DISCARDABLE 0, 0, 188, 281
! STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Inheritance"
FONT 8, "MS Sans Serif"
--- 122,127 ----
END
! IDD_PROPPAGE_INHERITANCE DIALOG 0, 0, 188, 281
! STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Inheritance"
FONT 8, "MS Sans Serif"
***************
*** 138,143 ****
END
! IDD_PROPPAGE_AGGREGATE DIALOG DISCARDABLE 0, 0, 183, 253
! STYLE WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Aggregate"
FONT 8, "MS Sans Serif"
--- 133,138 ----
END
! IDD_PROPPAGE_AGGREGATE DIALOG 0, 0, 183, 253
! STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Aggregate"
FONT 8, "MS Sans Serif"
***************
*** 151,158 ****
END
! IDD_OPTIONS_DIALOG DIALOG DISCARDABLE 0, 0, 221, 252
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Aggregate Tab Options"
! FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "OK",IDOK,49,223,50,14
--- 146,153 ----
END
! IDD_OPTIONS_DIALOG DIALOGEX 0, 0, 221, 252
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Aggregate Tab Options"
! FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
DEFPUSHBUTTON "OK",IDOK,49,223,50,14
***************
*** 170,180 ****
CONTROL "Display Connections",IDC_DISPLAY_CONNECTIONS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,71,94,80,10
! GROUPBOX "Sort",IDC_STATIC,65,118,96,49
CONTROL "Sort By Name",IDC_SORT,"Button",BS_AUTORADIOBUTTON |
! WS_GROUP,73,128,59,10
CONTROL "Sort By Type",IDC_SORT_BYTYPE,"Button",
! BS_AUTORADIOBUTTON,73,139,57,10
CONTROL "Sort By Creation",IDC_SORT_BYCREATION,"Button",
! BS_AUTORADIOBUTTON,73,152,67,10
CONTROL "PreserveTree State in Windows Registry",
IDC_STORE_TREE_REGISTRY,"Button",BS_AUTOCHECKBOX |
--- 165,175 ----
CONTROL "Display Connections",IDC_DISPLAY_CONNECTIONS,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,71,94,80,10
! GROUPBOX "Sort",IDC_STATIC,64,118,96,49
CONTROL "Sort By Name",IDC_SORT,"Button",BS_AUTORADIOBUTTON |
! WS_GROUP,71,129,59,10
CONTROL "Sort By Type",IDC_SORT_BYTYPE,"Button",
! BS_AUTORADIOBUTTON,71,141,57,10
CONTROL "Sort By Creation",IDC_SORT_BYCREATION,"Button",
! BS_AUTORADIOBUTTON,71,153,67,10
CONTROL "PreserveTree State in Windows Registry",
IDC_STORE_TREE_REGISTRY,"Button",BS_AUTOCHECKBOX |
***************
*** 184,188 ****
IDD_META_CONNECTION_DIALOG DIALOGEX 0, 0, 143, 183
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW
CAPTION "Meta Connection Properties"
--- 179,183 ----
IDD_META_CONNECTION_DIALOG DIALOGEX 0, 0, 143, 183
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW
CAPTION "Meta Connection Properties"
***************
*** 194,199 ****
END
! IDD_ATTACH_LIB_DIALOG DIALOG DISCARDABLE 0, 0, 280, 74
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Attach Library"
FONT 8, "MS Sans Serif"
--- 189,194 ----
END
! IDD_ATTACH_LIB_DIALOG DIALOG 0, 0, 280, 74
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Attach Library"
FONT 8, "MS Sans Serif"
***************
*** 214,218 ****
#ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_PROPPAGE_GMEACTIVEBROWSER, DIALOG
--- 209,213 ----
#ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO
BEGIN
IDD_PROPPAGE_GMEACTIVEBROWSER, DIALOG
***************
*** 280,284 ****
//
! IDR_GMEACTIVEBROWSER REGISTRY DISCARDABLE "GMEActiveBrowser.rgs"
/////////////////////////////////////////////////////////////////////////////
--- 275,279 ----
//
! IDR_GMEACTIVEBROWSER REGISTRY "GMEActiveBrowser.rgs"
/////////////////////////////////////////////////////////////////////////////
***************
*** 287,291 ****
//
! CG_IDR_POPUP_AGGREGATE_PROPERTY_PAGE_MULTIPLE_ITEMS MENU DISCARDABLE
BEGIN
POPUP "_POPUP_"
--- 282,286 ----
//
! CG_IDR_POPUP_AGGREGATE_PROPERTY_PAGE_MULTIPLE_ITEMS MENU
BEGIN
POPUP "_POPUP_"
***************
*** 315,319 ****
END
! CG_IDR_POPUP_AGGREGATE_PROPERTY_PAGE_GENERAL MENU DISCARDABLE
BEGIN
POPUP "_POPUP_"
--- 310,314 ----
END
! CG_IDR_POPUP_AGGREGATE_PROPERTY_PAGE_GENERAL MENU
BEGIN
POPUP "_POPUP_"
***************
*** 342,346 ****
END
! CG_IDR_POPUP_AGGREGATE_PROPERTY_PAGE_SINGLE_ITEM MENU DISCARDABLE
BEGIN
POPUP "_POPUP_"
--- 337,341 ----
END
! CG_IDR_POPUP_AGGREGATE_PROPERTY_PAGE_SINGLE_ITEM MENU
BEGIN
POPUP "_POPUP_"
***************
*** 398,402 ****
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
! IDI_LIBRARY ICON DISCARDABLE "Library.ico"
/////////////////////////////////////////////////////////////////////////////
--- 393,397 ----
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
! IDI_LIBRARY ICON "Library.ico"
/////////////////////////////////////////////////////////////////////////////
***************
*** 405,409 ****
//
! STRINGTABLE DISCARDABLE
BEGIN
IDS_GMEACTIVEBROWSER "GMEActiveBrowser Control"
--- 400,404 ----
//
! STRINGTABLE
BEGIN
IDS_GMEACTIVEBROWSER "GMEActiveBrowser Control"
***************
*** 411,415 ****
END
! STRINGTABLE DISCARDABLE
BEGIN
IDS_GMEACTIVEBROWSER_PPG_CAPTION "General"
--- 406,410 ----
END
! STRINGTABLE
BEGIN
IDS_GMEACTIVEBROWSER_PPG_CAPTION "General"
***************
*** 417,421 ****
END
! STRINGTABLE DISCARDABLE
BEGIN
AFX_IDS_APP_TITLE "Model Browser"
--- 412,416 ----
END
! STRINGTABLE
BEGIN
AFX_IDS_APP_TITLE "Model Browser"
Index: StdAfx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/StdAfx.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StdAfx.cpp 1 Mar 2002 21:53:00 -0000 1.1
--- StdAfx.cpp 26 Jan 2005 17:28:26 -0000 1.2
***************
*** 5,10 ****
#include "stdafx.h"
#ifdef _ATL_STATIC_REGISTRY
- #include <statreg.h>
#endif
- #include <atlimpl.cpp>
-
--- 5,7 ----
Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/StdAfx.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StdAfx.h 2 Oct 2002 18:17:00 -0000 1.3
--- StdAfx.h 26 Jan 2005 17:28:26 -0000 1.4
***************
*** 10,13 ****
--- 10,18 ----
// but are changed infrequently
+ #define STRICT
+ #ifndef _WIN32_WINNT
+ #define _WIN32_WINNT 0x0400
+ #endif
+
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
Index: TreeCtrlEx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/TreeCtrlEx.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TreeCtrlEx.cpp 12 Jan 2005 17:54:00 -0000 1.4
--- TreeCtrlEx.cpp 26 Jan 2005 17:28:26 -0000 1.5
***************
*** 49,53 ****
CTreeCtrlEx::CTreeCtrlEx() : m_bSelectPending(FALSE), m_hClickedItem(NULL), m_hFirstSelectedItem(NULL), m_bSelectionComplete(TRUE), m_bEditLabelPending(FALSE)
{
! //m_pchTip = NULL;
//m_pwchTip = NULL;
}
--- 49,53 ----
CTreeCtrlEx::CTreeCtrlEx() : m_bSelectPending(FALSE), m_hClickedItem(NULL), m_hFirstSelectedItem(NULL), m_bSelectionComplete(TRUE), m_bEditLabelPending(FALSE)
{
! //m_pchTip = NULL;
//m_pwchTip = NULL;
}
***************
*** 55,59 ****
CTreeCtrlEx::~CTreeCtrlEx()
{
! /*if(m_pwchTip != NULL)
delete m_pwchTip;
--- 55,59 ----
CTreeCtrlEx::~CTreeCtrlEx()
{
! /*if(m_pwchTip != NULL)
delete m_pwchTip;
***************
*** 64,68 ****
BEGIN_MESSAGE_MAP(CTreeCtrlEx, CTreeCtrl)
//{{AFX_MSG_MAP(CTreeCtrlEx)
! //ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText)
//ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)
ON_WM_LBUTTONDOWN()
--- 64,68 ----
BEGIN_MESSAGE_MAP(CTreeCtrlEx, CTreeCtrl)
//{{AFX_MSG_MAP(CTreeCtrlEx)
! //ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText)
//ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)
ON_WM_LBUTTONDOWN()
***************
*** 88,99 ****
VERIFY(AfxDeferRegisterClass(AFX_WNDCOMMCTL_TREEVIEW_REG));
! return CreateEx( dwExStyle, WC_TREEVIEW, NULL, dwStyle,
! rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top,
! pParentWnd->GetSafeHwnd(), (HMENU)nID );
}
BOOL CTreeCtrlEx::Create(DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID)
{
! return CTreeCtrl::Create(dwStyle, rect, pParentWnd, nID);
}
--- 88,104 ----
VERIFY(AfxDeferRegisterClass(AFX_WNDCOMMCTL_TREEVIEW_REG));
! //virtual BOOL CreateEx(DWORD dwExStyle, DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID);
! // changed for VC7's sake
! return CreateEx( dwExStyle, /*WC_TREEVIEW, NULL, */
! dwStyle,
! rect, //rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top,
! pParentWnd, //pParentWnd->GetSafeHwnd(),
! nID //(HMENU)nID );
! );
}
BOOL CTreeCtrlEx::Create(DWORD dwStyle, const RECT& rect, CWnd* pParentWnd, UINT nID)
{
! return CTreeCtrl::Create(dwStyle, rect, pParentWnd, nID);
}
***************
*** 421,425 ****
{
// Clear selection of all "multiple selected" items first
! ClearSelection(TRUE);
// Then select the clicked item
--- 426,430 ----
{
// Clear selection of all "multiple selected" items first
! ClearSelection(true);
// Then select the clicked item
Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/GMEActiveBrowser/resource.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** resource.h 5 Jan 2005 19:58:12 -0000 1.7
--- resource.h 26 Jan 2005 17:28:26 -0000 1.8
***************
*** 1,4 ****
//{{NO_DEPENDENCIES}}
! // Microsoft Developer Studio generated include file.
// Used by GMEActiveBrowser.rc
//
--- 1,4 ----
//{{NO_DEPENDENCIES}}
! // Microsoft Visual C++ generated include file.
// Used by GMEActiveBrowser.rc
//
***************
*** 66,73 ****
#define ID_EDIT_COPYSMART 32790
#define ID_POPUP_SELECTCOPY_CONNECTIONS 32793
! #define ID_EDIT_PASTECLOSURE 32795
! #define ID_EDIT_PASTESPECIAL_ASSUBTYPE 32796
! #define ID_EDIT_PASTESPECIAL_ASINSTANCE 32797
! #define ID_EDIT_PASTESPECIAL_ASREFERENCE 32798
// Next default values for new objects
--- 66,76 ----
#define ID_EDIT_COPYSMART 32790
#define ID_POPUP_SELECTCOPY_CONNECTIONS 32793
! #define ID_Menu 32794
! #define ID_EDIT_PASTESPECIAL_ASREFERENCE 32795
! #define ID_PASTESPECIAL_ID 32796
! #define ID_ID_ID 32797
! #define ID_EDIT_PASTESPECIAL_ASSUBTYPE 32798
! #define ID_EDIT_PASTESPECIAL_ASINSTANCE 32799
! #define ID_EDIT_PASTECLOSURE 32800
// Next default values for new objects
***************
*** 76,80 ****
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 220
! #define _APS_NEXT_COMMAND_VALUE 32799
#define _APS_NEXT_CONTROL_VALUE 218
#define _APS_NEXT_SYMED_VALUE 104
--- 79,83 ----
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 220
! #define _APS_NEXT_COMMAND_VALUE 32801
#define _APS_NEXT_CONTROL_VALUE 218
#define _APS_NEXT_SYMED_VALUE 104
--- GMEActiveBrowser.dsp DELETED ---
- Previous message: [GME-commit] GMESRC/GME/Mga Mga.vcproj,NONE,1.1 Mga.cpp,1.11,1.12
Mga.def,1.1,1.2 MgaAttribute.cpp,1.14,1.15 MgaAttribute.h,1.5,1.6
MgaCheck.cpp,1.6,1.7 MgaComplexOps.cpp,1.9,1.10
MgaConnection.cpp,1.16,1.17 MgaConnection.h,1.6,1.7
MgaConstraint.cpp,1.5,1.6 MgaConstraint.h,1.3,1.4
MgaCoreObj.h,1.3,1.4 MgaFCO.cpp,1.33,1.34 MgaFCO.h,1.20,1.21
MgaFilter.cpp,1.8,1.9 MgaFilter.h,1.6,1.7 MgaFolder.cpp,1.26,1.27
MgaFolder.h,1.6,1.7 MgaLib.idl,1.9,1.10 MgaModel.h,1.4,1.5
MgaProject.cpp,1.61,1.62 MgaReference.cpp,1.9,1.10
MgaReference.h,1.5,1.6 MgaSet.cpp,1.10,1.11 MgaSet.h,1.6,1.7
MgaTrukk.h,1.19,1.20 StdAfx.cpp,1.1,1.2 Mga.dsp,1.26,NONE
- Next message: [GME-commit] GMESRC/GME/Gme/AutoRoute ArGraph.cpp,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list