[GME-commit] GMESRC/GME/Search Search.vcproj,NONE,1.1 RegExp.h,1.1,1.2 Search.def,1.1,1.2 Search.rc,1.8,1.9 SearchDlg.cpp,1.14,1.15 StdAfx.h,1.2,1.3 resource.h,1.7,1.8 Search.dsp,1.4,NONE

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Wed Jan 26 11:31:35 CST 2005


Update of /var/lib/gme/GMESRC/GME/Search
In directory braindrain:/tmp/cvs-serv19193/GME/Search

Modified Files:
	RegExp.h Search.def Search.rc SearchDlg.cpp StdAfx.h 
	resource.h 
Added Files:
	Search.vcproj 
Removed Files:
	Search.dsp 
Log Message:
Checkin for VC7.1 upgrade


CVS User: zolmol

--- NEW FILE: Search.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
	ProjectType="Visual C++"
	Version="7.10"
	Name="Search"
	SccProjectName=""
	SccLocalPath=""
	Keyword="MFCProj">
	<Platforms>
		<Platform
			Name="Win32"/>
	</Platforms>
	<Configurations>
		<Configuration
			Name="Debug|Win32"
			OutputDirectory=".\Debug"
			IntermediateDirectory=".\Debug"
			ConfigurationType="2"
			UseOfMFC="2"
			UseOfATL="0"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="0"
				AdditionalIncludeDirectories="../Common,../Interfaces"
				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL"
				BasicRuntimeChecks="3"
				RuntimeLibrary="3"
				UsePrecompiledHeader="3"
				PrecompiledHeaderThrough="stdafx.h"
				PrecompiledHeaderFile=".\Debug/Search.pch"
				AssemblerListingLocation=".\Debug/"
				ObjectFile=".\Debug/"
				ProgramDataBaseFileName=".\Debug/"
				BrowseInformation="1"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				DebugInformationFormat="4"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"
				Description="Registering ActiveX Control..."
				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;
echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
"
				Outputs="$(OutDir)\regsvr32.trg"/>
			<Tool
				Name="VCLinkerTool"
				OutputFile=".\Debug/Search.ocx"
				LinkIncremental="2"
				SuppressStartupBanner="TRUE"
				ModuleDefinitionFile=".\Search.def"
				GenerateDebugInformation="TRUE"
				ProgramDatabaseFile=".\Debug/Search.pdb"
				SubSystem="2"
				BaseAddress="0x61100000"
				ImportLibrary=".\Debug/Search.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="_DEBUG"
				MkTypLibCompatible="TRUE"
				SuppressStartupBanner="TRUE"
				TargetEnvironment="1"
				TypeLibraryName=".\Debug/Search.tlb"
				HeaderFileName=""/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="_DEBUG"
				Culture="1033"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
		<Configuration
			Name="Release|Win32"
			OutputDirectory=".\Release"
			IntermediateDirectory=".\Release"
			ConfigurationType="2"
			UseOfMFC="2"
			ATLMinimizesCRunTimeLibraryUsage="FALSE"
			CharacterSet="2">
			<Tool
				Name="VCCLCompilerTool"
				Optimization="1"
				InlineFunctionExpansion="1"
				AdditionalIncludeDirectories="../Common,../Interfaces"
				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL"
				StringPooling="TRUE"
				RuntimeLibrary="2"
				EnableFunctionLevelLinking="TRUE"
				UsePrecompiledHeader="3"
				PrecompiledHeaderThrough="stdafx.h"
				PrecompiledHeaderFile=".\Release/Search.pch"
				AssemblerListingLocation=".\Release/"
				ObjectFile=".\Release/"
				ProgramDataBaseFileName=".\Release/"
				WarningLevel="3"
				SuppressStartupBanner="TRUE"
				DebugInformationFormat="3"
				CompileAs="0"/>
			<Tool
				Name="VCCustomBuildTool"
				Description="Registering ActiveX Control..."
				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;
echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
"
				Outputs="$(OutDir)\regsvr32.trg"/>
			<Tool
				Name="VCLinkerTool"
				OutputFile=".\Release/Search.ocx"
				LinkIncremental="1"
				SuppressStartupBanner="TRUE"
				ModuleDefinitionFile=".\Search.def"
				GenerateDebugInformation="TRUE"
				ProgramDatabaseFile=".\Release/Search.pdb"
				GenerateMapFile="TRUE"
				MapFileName=".\Release/Search.map"
				SubSystem="2"
				BaseAddress="0x61100000"
				ImportLibrary=".\Release/Search.lib"
				TargetMachine="1"/>
			<Tool
				Name="VCMIDLTool"
				PreprocessorDefinitions="NDEBUG"
				MkTypLibCompatible="TRUE"
				SuppressStartupBanner="TRUE"
				TargetEnvironment="1"
				TypeLibraryName=".\Release/Search.tlb"
				HeaderFileName=""/>
			<Tool
				Name="VCPostBuildEventTool"/>
			<Tool
				Name="VCPreBuildEventTool"/>
			<Tool
				Name="VCPreLinkEventTool"/>
			<Tool
				Name="VCResourceCompilerTool"
				PreprocessorDefinitions="NDEBUG"
				Culture="1033"/>
			<Tool
				Name="VCWebServiceProxyGeneratorTool"/>
			<Tool
				Name="VCXMLDataGeneratorTool"/>
			<Tool
				Name="VCWebDeploymentTool"/>
			<Tool
				Name="VCManagedWrapperGeneratorTool"/>
			<Tool
				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
		</Configuration>
	</Configurations>
	<References>
	</References>
	<Files>
		<Filter
			Name="Source Files"
			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
			<File
				RelativePath="ComHelp.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="..\Common\CommonError.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Input.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="RegExp.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Search.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Search.def">
			</File>
			<File
				RelativePath="Search.odl">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCMIDLTool"
						PreprocessorDefinitions=""
						TargetEnvironment="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCMIDLTool"
						PreprocessorDefinitions=""
						TargetEnvironment="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Search.rc">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCResourceCompilerTool"
						PreprocessorDefinitions=""
						AdditionalIncludeDirectories="$(OUTDIR)"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCResourceCompilerTool"
						PreprocessorDefinitions=""
						AdditionalIncludeDirectories="$(OUTDIR)"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="SearchAlg.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="SearchCtl.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="SearchDlg.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="SearchPpg.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="StdAfx.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						UsePrecompiledHeader="1"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						UsePrecompiledHeader="1"/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="Validate.cpp">
				<FileConfiguration
					Name="Debug|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="0"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""
						BasicRuntimeChecks="3"
						BrowseInformation="1"/>
				</FileConfiguration>
				<FileConfiguration
					Name="Release|Win32">
					<Tool
						Name="VCCLCompilerTool"
						Optimization="1"
						AdditionalIncludeDirectories=""
						PreprocessorDefinitions=""/>
				</FileConfiguration>
			</File>
		</Filter>
		<Filter
			Name="Header Files"
			Filter="h;hpp;hxx;hm;inl">
			<File
				RelativePath="ComHelp.h">
			</File>
			<File
				RelativePath="Input.h">
			</File>
			<File
				RelativePath="RegExp.h">
			</File>
			<File
				RelativePath="Resource.h">
			</File>
			<File
				RelativePath="Search.h">
			</File>
			<File
				RelativePath="SearchAlg.h">
			</File>
			<File
				RelativePath="SearchCtl.h">
			</File>
			<File
				RelativePath="SearchDefs.h">
			</File>
			<File
				RelativePath="SearchDlg.h">
			</File>
			<File
				RelativePath="SearchPpg.h">
			</File>
			<File
				RelativePath="StdAfx.h">
			</File>
			<File
				RelativePath="Validate.h">
			</File>
		</Filter>
		<Filter
			Name="Resource Files"
			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
			<File
				RelativePath="Search.ico">
			</File>
			<File
				RelativePath="SearchCtl.bmp">
			</File>
		</Filter>
		<File
			RelativePath="ReadMe.txt">
		</File>
	</Files>
	<Globals>
	</Globals>
</VisualStudioProject>

Index: RegExp.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Search/RegExp.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RegExp.h	13 Dec 2002 19:46:00 -0000	1.1
--- RegExp.h	26 Jan 2005 17:31:00 -0000	1.2
***************
*** 4,8 ****
  #define __REGEXP_H__
  
! class CString;
  class regexp;
  
--- 4,8 ----
  #define __REGEXP_H__
  
! //class CString; //commented for VC7
  class regexp;
  

Index: Search.def
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Search/Search.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Search.def	6 Dec 2002 16:56:00 -0000	1.1
--- Search.def	26 Jan 2005 17:31:00 -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: Search.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Search/Search.rc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Search.rc	14 Feb 2003 21:21:51 -0000	1.8
--- Search.rc	26 Jan 2005 17:31:00 -0000	1.9
***************
*** 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 ""Search.tlb""\r\n"
--- 39,43 ----
  END
  
! 3 TEXTINCLUDE 
  BEGIN
      "1 TYPELIB ""Search.tlb""\r\n"
***************
*** 48,52 ****
  
  
- #ifndef _MAC
  /////////////////////////////////////////////////////////////////////////////
  //
--- 48,51 ----
***************
*** 71,84 ****
          BLOCK "040904B0"
          BEGIN
!             VALUE "CompanyName", "ISIS, Vanderbilt University\0"
!             VALUE "FileDescription", "Search ActiveX Control Module\0"
!             VALUE "FileVersion", "1, 0, 0, 1\0"
!             VALUE "InternalName", "Search\0"
!             VALUE "LegalCopyright", "Copyright (C) 2002\0"
!             VALUE "LegalTrademarks", "\0"
!             VALUE "OriginalFilename", "Search.OCX\0"
!             VALUE "ProductName", "Search ActiveX Control Module\0"
!             VALUE "ProductVersion", "1, 0, 0, 1\0"
!             VALUE "OLESelfRegister", "\0"
          END
      END
--- 70,81 ----
          BLOCK "040904B0"
          BEGIN
!             VALUE "CompanyName", "ISIS, Vanderbilt University"
!             VALUE "FileDescription", "Search ActiveX Control Module"
!             VALUE "FileVersion", "1, 0, 0, 1"
!             VALUE "InternalName", "Search"
!             VALUE "LegalCopyright", "Copyright (C) 2002"
!             VALUE "OriginalFilename", "Search.OCX"
!             VALUE "ProductName", "Search ActiveX Control Module"
!             VALUE "ProductVersion", "1, 0, 0, 1"
          END
      END
***************
*** 89,94 ****
  END
  
- #endif    // !_MAC
- 
  
  /////////////////////////////////////////////////////////////////////////////
--- 86,89 ----
***************
*** 99,103 ****
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
! IDI_ABOUTDLL            ICON    DISCARDABLE     "Search.ico"
  
  /////////////////////////////////////////////////////////////////////////////
--- 94,98 ----
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
! IDI_ABOUTDLL            ICON                    "Search.ico"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 106,110 ****
  //
  
! IDB_SEARCH              BITMAP  DISCARDABLE     "SearchCtl.bmp"
  
  /////////////////////////////////////////////////////////////////////////////
--- 101,105 ----
  //
  
! IDB_SEARCH              BITMAP                  "SearchCtl.bmp"
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 113,118 ****
  //
  
! IDD_ABOUTBOX_SEARCH DIALOG DISCARDABLE  34, 22, 260, 38
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "About GME Search Control"
  FONT 8, "MS Sans Serif"
--- 108,113 ----
  //
  
! IDD_ABOUTBOX_SEARCH DIALOG  34, 22, 260, 38
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "About GME Search Control"
  FONT 8, "MS Sans Serif"
***************
*** 125,130 ****
  END
  
! IDD_PROPPAGE_SEARCH DIALOG DISCARDABLE  0, 0, 250, 62
! STYLE WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
--- 120,125 ----
  END
  
! IDD_PROPPAGE_SEARCH DIALOG  0, 0, 250, 62
! STYLE DS_SETFONT | WS_CHILD
  FONT 8, "MS Sans Serif"
  BEGIN
***************
*** 133,139 ****
  END
  
! IDD_SEARCH_DIALOG DIALOG DISCARDABLE  0, 0, 237, 233
! STYLE WS_CHILD | WS_VISIBLE
! FONT 8, "MS Sans Serif"
  BEGIN
      LTEXT           "Name:",IDC_STATICNAME,29,18,22,8
--- 128,134 ----
  END
  
! IDD_SEARCH_DIALOG DIALOGEX 0, 0, 237, 233
! STYLE DS_SETFONT | WS_CHILD | WS_VISIBLE
! FONT 8, "MS Sans Serif", 0, 0, 0x0
  BEGIN
      LTEXT           "Name:",IDC_STATICNAME,29,18,22,8
***************
*** 170,174 ****
      CONTROL         "Progress1",IDC_PROGRESSSEARCH,"msctls_progress32",NOT 
                      WS_VISIBLE | WS_BORDER,16,162,199,20
!     LTEXT           "NULL References",IDC_STATICREF,117,88,113,8
  END
  
--- 165,169 ----
      CONTROL         "Progress1",IDC_PROGRESSSEARCH,"msctls_progress32",NOT 
                      WS_VISIBLE | WS_BORDER,16,162,199,20
!     LTEXT           "NULL References",IDC_STATICREF,117,88,111,8
  END
  
***************
*** 180,184 ****
  
  #ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO DISCARDABLE 
  BEGIN
      IDD_ABOUTBOX_SEARCH, DIALOG
--- 175,179 ----
  
  #ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO 
  BEGIN
      IDD_ABOUTBOX_SEARCH, DIALOG
***************
*** 233,237 ****
  //
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      IDS_SEARCH              "GME Search Control"
--- 228,232 ----
  //
  
! STRINGTABLE 
  BEGIN
      IDS_SEARCH              "GME Search Control"
***************
*** 239,243 ****
  END
  
! STRINGTABLE DISCARDABLE 
  BEGIN
      IDS_SEARCH_PPG_CAPTION  "General"
--- 234,238 ----
  END
  
! STRINGTABLE 
  BEGIN
      IDS_SEARCH_PPG_CAPTION  "General"

Index: SearchDlg.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Search/SearchDlg.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** SearchDlg.cpp	31 Mar 2003 21:11:32 -0000	1.14
--- SearchDlg.cpp	26 Jan 2005 17:31:00 -0000	1.15
***************
*** 393,397 ****
  		CString name;
  		COMTHROW( selectedFCO->get_Name(bstr));
! 		name = bstr + " References";
  		m_stcRefCtrl.SetWindowText(name);
  		m_stcRefCtrl.ShowWindow(TRUE);
--- 393,397 ----
  		CString name;
  		COMTHROW( selectedFCO->get_Name(bstr));
! 		name = CString( bstr) + " References";
  		m_stcRefCtrl.SetWindowText(name);
  		m_stcRefCtrl.ShowWindow(TRUE);
***************
*** 429,433 ****
  		CString name;
  		COMTHROW( selectedFCO->get_Name(bstr));
! 		name = bstr + " References";
  		m_stcRefCtrl.SetWindowText(name);
  		m_stcRefCtrl.ShowWindow(TRUE);
--- 429,433 ----
  		CString name;
  		COMTHROW( selectedFCO->get_Name(bstr));
! 		name = CString( bstr) + " References";
  		m_stcRefCtrl.SetWindowText(name);
  		m_stcRefCtrl.ShowWindow(TRUE);

Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Search/StdAfx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StdAfx.h	7 Dec 2002 02:29:00 -0000	1.2
--- StdAfx.h	26 Jan 2005 17:31:00 -0000	1.3
***************
*** 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: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Search/resource.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** resource.h	14 Feb 2003 21:21:51 -0000	1.7
--- resource.h	26 Jan 2005 17:31:00 -0000	1.8
***************
*** 1,4 ****
  //{{NO_DEPENDENCIES}}
! // Microsoft Developer Studio generated include file.
  // Used by Search.rc
  //
--- 1,4 ----
  //{{NO_DEPENDENCIES}}
! // Microsoft Visual C++ generated include file.
  // Used by Search.rc
  //
***************
*** 37,40 ****
--- 37,41 ----
  #define IDC_PROGRESSSEARCH              227
  #define IDC_STATICREF                   228
+ #define IDC_STATICREF2                  229
  
  // Next default values for new objects

--- Search.dsp DELETED ---



More information about the GME-commit mailing list