From: Kimmo Varis Date: Sat, 11 Mar 2006 20:46:16 +0000 (+0000) Subject: PATCH: [ 1447806 ] Use JPEG splashscreen X-Git-Tag: 2.16.5~5153 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fe8bc9e7b4ec5a4c2c695cb82ecb00bbb8ffb9d9;p=winmerge-jp%2Fwinmerge-jp.git PATCH: [ 1447806 ] Use JPEG splashscreen --- diff --git a/Src/Changes.txt b/Src/Changes.txt index dcdcfe7a2..654e85280 100644 --- a/Src/Changes.txt +++ b/Src/Changes.txt @@ -21,6 +21,12 @@ Add new items to top. Docs/Users: Contributors.txt PATCH: [ 1447348 ] Build language files to Build directory Src/Languages: BuildDll.bat + PATCH: [ 1447806 ] Use JPEG splashscreen + Src: Merge.dsp Merge.rc resource.h Splash.cpp Splash.h + Src/Common new files: Picture.cpp Picture.h + Src/res new file: splash.jpg + Src/res deleted file: splash1.bmp + Src/Languages/*: Merge*.rc 2006-03-11 Takashi BUG: [ 1441389 ] Comparing root directory - mysterious diff --git a/Src/Common/Picture.cpp b/Src/Common/Picture.cpp new file mode 100644 index 000000000..95d148ba5 --- /dev/null +++ b/Src/Common/Picture.cpp @@ -0,0 +1,143 @@ +//////////////////////////////////////////////////////////////// +// MSDN Magazine -- October 2001 +// If this code works, it was written by Paul DiLascia. +// If not, I don't know who wrote it. +// Compiles with Visual C++ 6.0 for Windows 98 and probably Windows 2000 too. +// Set tabsize = 3 in your editor. +// +#include "StdAfx.h" +#include +#include "Picture.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif + +//////////////////////////////////////////////////////////////// +// CPicture implementation +// + +CPicture::CPicture() +{ +} + +CPicture::~CPicture() +{ +} + +////////////////// +// Load from resource. Looks for "IMAGE" type. +// +BOOL CPicture::Load(UINT nIDRes) +{ + // find resource in resource file + HINSTANCE hInst = AfxGetResourceHandle(); + HRSRC hRsrc = ::FindResource(hInst, + MAKEINTRESOURCE(nIDRes), + TEXT("IMAGE")); // type + if (!hRsrc) + return FALSE; + + // load resource into memory + DWORD len = SizeofResource(hInst, hRsrc); + BYTE* lpRsrc = (BYTE*)LoadResource(hInst, hRsrc); + if (!lpRsrc) + return FALSE; + + // create memory file and load it + CMemFile file(lpRsrc, len); + BOOL bRet = Load(file); + FreeResource(hRsrc); + + return bRet; +} + +////////////////// +// Load from path name. +// +BOOL CPicture::Load(LPCTSTR pszPathName) +{ + CFile file; + if (!file.Open(pszPathName, CFile::modeRead|CFile::shareDenyWrite)) + return FALSE; + BOOL bRet = Load(file); + file.Close(); + return bRet; +} + +////////////////// +// Load from CFile +// +BOOL CPicture::Load(CFile& file) +{ + CArchive ar(&file, CArchive::load | CArchive::bNoFlushOnDelete); + return Load(ar); +} + +////////////////// +// Load from archive--create stream and load from stream. +// +// CArchiveStream Doesn't compile with VS2003.Net +BOOL CPicture::Load(CArchive& ar) +{ + CArchiveStream arcstream(&ar); + return Load((IStream*)&arcstream); +} + + +////////////////// +// Load from stream (IStream). This is the one that really does it: call +// OleLoadPicture to do the work. +// +BOOL CPicture::Load(IStream* pstm) +{ + Free(); + HRESULT hr = OleLoadPicture(pstm, 0, FALSE, + IID_IPicture, (void**)&m_spIPicture); + ASSERT(SUCCEEDED(hr) && m_spIPicture); + return TRUE; +} + +////////////////// +// Render to device context. Covert to HIMETRIC for IPicture. +// +BOOL CPicture::Render(CDC* pDC, CRect rc, LPCRECT prcMFBounds) const +{ + ASSERT(pDC); + + if (rc.IsRectNull()) { + CSize sz = GetImageSize(pDC); + rc.right = sz.cx; + rc.bottom = sz.cy; + } + long hmWidth,hmHeight; // HIMETRIC units + GetHIMETRICSize(hmWidth, hmHeight); + m_spIPicture->Render(*pDC, rc.left, rc.top, rc.Width(), rc.Height(), + 0, hmHeight, hmWidth, -hmHeight, prcMFBounds); + + return TRUE; +} + +////////////////// +// Get image size in pixels. Converts from HIMETRIC to device coords. +// +CSize CPicture::GetImageSize(CDC* pDC) const +{ + if (!m_spIPicture) + return CSize(0,0); + + LONG hmWidth, hmHeight; // HIMETRIC units + m_spIPicture->get_Width(&hmWidth); + m_spIPicture->get_Height(&hmHeight); + CSize sz(hmWidth,hmHeight); + if (pDC==NULL) { + CWindowDC dc(NULL); + dc.HIMETRICtoDP(&sz); // convert to pixels + } else { + pDC->HIMETRICtoDP(&sz); + } + return sz; +} + diff --git a/Src/Common/Picture.h b/Src/Common/Picture.h new file mode 100644 index 000000000..6a5adbad7 --- /dev/null +++ b/Src/Common/Picture.h @@ -0,0 +1,53 @@ +//////////////////////////////////////////////////////////////// +// MSDN Magazine -- October 2001 +// If this code works, it was written by Paul DiLascia. +// If not, I don't know who wrote it. +// Compiles with Visual C++ 6.0 for Windows 98 and probably Windows 2000 too. +// Set tabsize = 3 in your editor. +// +#pragma once +#include + +////////////////// +// Picture object--encapsulates IPicture +// +class CPicture { +public: + CPicture(); + ~CPicture(); + + // Load frm various sosurces + BOOL Load(UINT nIDRes); + BOOL Load(LPCTSTR pszPathName); + BOOL Load(CFile& file); + BOOL Load(CArchive& ar); + BOOL Load(IStream* pstm); + + // render to device context + BOOL Render(CDC* pDC, CRect rc=CRect(0,0,0,0), + LPCRECT prcMFBounds=NULL) const; + + CSize GetImageSize(CDC* pDC=NULL) const; + + operator IPicture*() { + return m_spIPicture; + } + + void GetHIMETRICSize(OLE_XSIZE_HIMETRIC& cx, OLE_YSIZE_HIMETRIC& cy) const { + cx = cy = 0; + const_cast(this)->m_hr = m_spIPicture->get_Width(&cx); + ASSERT(SUCCEEDED(m_hr)); + const_cast(this)->m_hr = m_spIPicture->get_Height(&cy); + ASSERT(SUCCEEDED(m_hr)); + } + + void Free() { + if (m_spIPicture) { + m_spIPicture.Release(); + } + } + +protected: + CComQIPtrm_spIPicture; // ATL smart pointer to IPicture + HRESULT m_hr; // last error code +}; diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc index 6eed6a5ee..b3fe2e78f 100644 --- a/Src/Languages/Brazilian/MergeBrazilian.rc +++ b/Src/Languages/Brazilian/MergeBrazilian.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Bulgarian/MergeBulgarian.rc b/Src/Languages/Bulgarian/MergeBulgarian.rc index 33251e537..6adb29810 100644 --- a/Src/Languages/Bulgarian/MergeBulgarian.rc +++ b/Src/Languages/Bulgarian/MergeBulgarian.rc @@ -1609,6 +1609,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc index 34f32fc42..0d94f7cec 100644 --- a/Src/Languages/Catalan/MergeCatalan.rc +++ b/Src/Languages/Catalan/MergeCatalan.rc @@ -1609,6 +1609,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc index 66200559c..fe79ebf25 100644 --- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc +++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc @@ -1593,6 +1593,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc index 5f13e1021..c34b8681e 100644 --- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc +++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc index 5026905d9..229fbd9b7 100644 --- a/Src/Languages/Czech/MergeCzech.rc +++ b/Src/Languages/Czech/MergeCzech.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc index f6cfb7569..dfe3df2b1 100644 --- a/Src/Languages/Danish/MergeDanish.rc +++ b/Src/Languages/Danish/MergeDanish.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc index 8fa1dd66a..0c3cf09e7 100644 --- a/Src/Languages/Dutch/MergeDutch.rc +++ b/Src/Languages/Dutch/MergeDutch.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc index d97456419..35be56d1e 100644 --- a/Src/Languages/French/MergeFrench.rc +++ b/Src/Languages/French/MergeFrench.rc @@ -1558,6 +1558,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc index e0f499edb..a25f25380 100644 --- a/Src/Languages/German/MergeGerman.rc +++ b/Src/Languages/German/MergeGerman.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Hungarian/MergeHungarian.rc b/Src/Languages/Hungarian/MergeHungarian.rc index 05de2617f..6506485ae 100644 --- a/Src/Languages/Hungarian/MergeHungarian.rc +++ b/Src/Languages/Hungarian/MergeHungarian.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc index 1101a4088..94ea41a4e 100644 --- a/Src/Languages/Italian/MergeItalian.rc +++ b/Src/Languages/Italian/MergeItalian.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Japanese/MergeJapanese.rc b/Src/Languages/Japanese/MergeJapanese.rc index f0f2b4a94..89a0a9428 100644 --- a/Src/Languages/Japanese/MergeJapanese.rc +++ b/Src/Languages/Japanese/MergeJapanese.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc index e2874ce8c..b737c4268 100644 --- a/Src/Languages/Korean/MergeKorean.rc +++ b/Src/Languages/Korean/MergeKorean.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc index a757fcf2a..a4fc89043 100644 --- a/Src/Languages/Norwegian/MergeNorwegian.rc +++ b/Src/Languages/Norwegian/MergeNorwegian.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc index d0129e257..99545c150 100644 --- a/Src/Languages/Polish/MergePolish.rc +++ b/Src/Languages/Polish/MergePolish.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc index 242b60bed..b68d5c05f 100644 --- a/Src/Languages/Russian/MergeRussian.rc +++ b/Src/Languages/Russian/MergeRussian.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc index 9d6b881d1..4da1dfb8a 100644 --- a/Src/Languages/Slovak/MergeSlovak.rc +++ b/Src/Languages/Slovak/MergeSlovak.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc index 641d9a51b..063852cce 100644 --- a/Src/Languages/Spanish/MergeSpanish.rc +++ b/Src/Languages/Spanish/MergeSpanish.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc index 9d74bde11..dc431e1e7 100644 --- a/Src/Languages/Swedish/MergeSwedish.rc +++ b/Src/Languages/Swedish/MergeSwedish.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Languages/Turkish/MergeTurkish.rc b/Src/Languages/Turkish/MergeTurkish.rc index d1a6d40be..12471a2ef 100644 --- a/Src/Languages/Turkish/MergeTurkish.rc +++ b/Src/Languages/Turkish/MergeTurkish.rc @@ -1591,6 +1591,13 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "..\\..\\res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // diff --git a/Src/Merge.dsp b/Src/Merge.dsp index 5f30ef083..17187d448 100644 --- a/Src/Merge.dsp +++ b/Src/Merge.dsp @@ -627,6 +627,10 @@ SOURCE=.\paths.cpp # End Source File # Begin Source File +SOURCE=.\Common\Picture.cpp +# End Source File +# Begin Source File + SOURCE=.\PluginManager.cpp # End Source File # Begin Source File @@ -704,7 +708,6 @@ SOURCE=.\PropTextColors.cpp # End Source File # Begin Source File - SOURCE=.\PropVss.cpp !IF "$(CFG)" == "Merge - Win32 Debug" @@ -1266,6 +1269,10 @@ SOURCE=.\paths.h # End Source File # Begin Source File +SOURCE=.\Common\Picture.h +# End Source File +# Begin Source File + SOURCE=.\PluginManager.h # End Source File # Begin Source File diff --git a/Src/Merge.rc b/Src/Merge.rc index 53d04b0b4..9d405ae82 100644 --- a/Src/Merge.rc +++ b/Src/Merge.rc @@ -1591,11 +1591,17 @@ END ///////////////////////////////////////////////////////////////////////////// // +// Image +// +IDR_SPLASH IMAGE "res\\splash.jpg" + + +///////////////////////////////////////////////////////////////////////////// +// // Bitmap // IDR_MAINFRAME BITMAP "res\\Toolbar.bmp" -IDB_SPLASH BITMAP "res\\splash1.bmp" IDB_EDIT_COPY BITMAP "res\\copy.bmp" IDB_EDIT_CUT BITMAP "res\\cut.bmp" IDB_EDIT_PASTE BITMAP "res\\paste.bmp" diff --git a/Src/Splash.cpp b/Src/Splash.cpp index 44c1d100d..0dc428813 100644 --- a/Src/Splash.cpp +++ b/Src/Splash.cpp @@ -30,6 +30,7 @@ #include "stdafx.h" #include "resource.h" +#include "Picture.h" #include "Splash.h" #include "version.h" @@ -69,6 +70,7 @@ CSplashWnd* CSplashWnd::c_pSplashWnd; * @brief Default constructor. */ CSplashWnd::CSplashWnd() + : m_pPicture(NULL) { } @@ -140,26 +142,35 @@ BOOL CSplashWnd::PreTranslateAppMessage(MSG* pMsg) } /** - * @brief Loads splashscreen bitmap + * @brief Loads splashscreen image. + * Loads splashscreen image from resource and creates window with same size. */ BOOL CSplashWnd::Create(CWnd* pParentWnd /*= NULL*/) { - if (!m_bitmap.LoadBitmap(IDB_SPLASH)) + if (m_pPicture == NULL) + m_pPicture = new CPicture(); + + if (m_pPicture == NULL) + return FALSE; + + if (!m_pPicture->Load(IDR_SPLASH)) return FALSE; - BITMAP bm; - m_bitmap.GetBitmap(&bm); + CSize imgSize = m_pPicture->GetImageSize(); return CreateEx(0, AfxRegisterWndClass(0, AfxGetApp()->LoadStandardCursor(IDC_ARROW)), - NULL, WS_POPUP | WS_VISIBLE, 0, 0, bm.bmWidth, bm.bmHeight, pParentWnd->GetSafeHwnd(), NULL); + NULL, WS_POPUP | WS_VISIBLE, 0, 0, imgSize.cx, imgSize.cy, pParentWnd->GetSafeHwnd(), NULL); } /** - * @brief Destroy the window, and update the mainframe. + * @brief Destroy the window and splash image then update the mainframe. */ void CSplashWnd::HideSplashScreen() { + m_pPicture->Free(); + delete m_pPicture; + m_pPicture = NULL; DestroyWindow(); AfxGetMainWnd()->UpdateWindow(); } @@ -190,23 +201,14 @@ int CSplashWnd::OnCreate(LPCREATESTRUCT lpCreateStruct) } /** - * @brief Add version text to bitmap. + * @brief Paint splashscreen. + * Draws image to window size (which is already set to image size). + * Then adds texts over image. */ void CSplashWnd::OnPaint() { CPaintDC dc(this); - - CDC dcImage; - if (!dcImage.CreateCompatibleDC(&dc)) - return; - - BITMAP bm; - m_bitmap.GetBitmap(&bm); - - // Paint the image. - CBitmap* pOldBitmap = dcImage.SelectObject(&m_bitmap); - dc.BitBlt(0, 0, bm.bmWidth, bm.bmHeight, &dcImage, 0, 0, SRCCOPY); - dcImage.SelectObject(pOldBitmap); + m_pPicture->Render(&dc); CVersionInfo version; CString s; diff --git a/Src/Splash.h b/Src/Splash.h index 35461c045..8e03a9e9a 100644 --- a/Src/Splash.h +++ b/Src/Splash.h @@ -18,7 +18,7 @@ // ///////////////////////////////////////////////////////////////////////////// /** - * @file Splash.h + * @file Src/Splash.h * * @brief Declaration file for CSplashWnd * @@ -29,9 +29,13 @@ #ifndef _SPLASH_SCRN_ #define _SPLASH_SCRN_ -///////////////////////////////////////////////////////////////////////////// -// Splash Screen class +class CPicture; +/** + * @brief Splash screen class. + * Loads image from resource and shows it as a splash screen + * at program startup. + */ class CSplashWnd : public CWnd { // Construction @@ -39,8 +43,8 @@ protected: CSplashWnd(); // Attributes: -public: - CBitmap m_bitmap; +private: + CPicture * m_pPicture; /**< Image loader/viewer for splash image */ // Operations public: diff --git a/Src/res/splash.jpg b/Src/res/splash.jpg new file mode 100644 index 000000000..b566208db Binary files /dev/null and b/Src/res/splash.jpg differ diff --git a/Src/res/splash1.bmp b/Src/res/splash1.bmp deleted file mode 100644 index 636294500..000000000 Binary files a/Src/res/splash1.bmp and /dev/null differ diff --git a/Src/resource.h b/Src/resource.h index 49d84bed3..9133b5568 100644 --- a/Src/resource.h +++ b/Src/resource.h @@ -49,7 +49,7 @@ #define IDD_LOAD_SAVE_CODEPAGE 230 #define IDD_TEST_FILTER 231 #define IDD_PROPPAGE_COLORS_TEXT 232 -#define IDB_SPLASH 308 +#define IDR_SPLASH 308 #define IDB_WINMERGE 309 #define IDB_OLDSPLASH 310 #define IDB_EDIT_COPY 316