crystaledit: Remove splash.*

diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
index 94f8b42..843ec10 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
@@ -172,6 +172,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -211,6 +212,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -252,6 +254,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -292,6 +295,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -331,6 +335,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -371,6 +376,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -413,6 +419,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -454,6 +461,7 @@
       <WarningLevel>Level4</WarningLevel>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>\r
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>\r
     </ClCompile>\r
     <ResourceCompile>\r
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -532,7 +540,6 @@
     <ClCompile Include="..\editlib\sgml.cpp" />\r
     <ClCompile Include="..\editlib\sh.cpp" />\r
     <ClCompile Include="..\editlib\siod.cpp" />\r
-    <ClCompile Include="..\editlib\splash.cpp" />\r
     <ClCompile Include="..\editlib\sql.cpp" />\r
     <ClCompile Include="..\editlib\statbar.cpp" />\r
     <ClCompile Include="..\editlib\string_util.cpp">\r
@@ -609,7 +616,6 @@
     <ClInclude Include="..\editlib\crystallineparser.h" />\r
     <ClInclude Include="..\editlib\memcombo.h" />\r
     <ClInclude Include="..\editlib\registry.h" />\r
-    <ClInclude Include="..\editlib\splash.h" />\r
     <ClInclude Include="..\editlib\statbar.h" />\r
     <ClInclude Include="..\editlib\string_util.h" />\r
     <ClInclude Include="..\editlib\SyntaxColors.h" />\r

diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj.filters b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj.filters
index 90c90b8..2f51128 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj.filters
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj.filters
@@ -96,9 +96,6 @@
     <ClCompile Include="..\editlib\registry.cpp">\r
       <Filter>editlib</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\editlib\splash.cpp">\r
-      <Filter>editlib</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\editlib\statbar.cpp">\r
       <Filter>editlib</Filter>\r
     </ClCompile>\r
@@ -241,7 +238,7 @@
       <Filter>editlib</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\editlib\ccrystalrendererdirectwrite.cpp">\r
-      <Filter>Source Files</Filter>\r
+      <Filter>editlib</Filter>\r
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
@@ -331,9 +328,6 @@
     <ClInclude Include="..\editlib\registry.h">\r
       <Filter>editlib</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\editlib\splash.h">\r
-      <Filter>editlib</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\editlib\statbar.h">\r
       <Filter>editlib</Filter>\r
     </ClInclude>\r
@@ -370,10 +364,10 @@
     <ClInclude Include="..\editlib\ccrystalrenderer.h">\r
       <Filter>editlib</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\editlib\ccrystalrendererdirectdraw.h">\r
+    <ClInclude Include="..\editlib\ccrystalrenderergdi.h">\r
       <Filter>editlib</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\editlib\ccrystalrenderergdi.h">\r
+    <ClInclude Include="..\editlib\ccrystalrendererdirectwrite.h">\r
       <Filter>editlib</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r

diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
index b711a97..c7bf73b 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj
@@ -171,6 +171,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -210,6 +211,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -251,6 +253,7 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -291,6 +294,7 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -330,6 +334,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -370,6 +375,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -412,6 +418,7 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -453,6 +460,7 @@
       <WarningLevel>Level4</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DisableSpecificWarnings>4100;4189;4204;4505</DisableSpecificWarnings>
+      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -531,7 +539,6 @@
     <ClCompile Include="..\editlib\sgml.cpp" />
     <ClCompile Include="..\editlib\sh.cpp" />
     <ClCompile Include="..\editlib\siod.cpp" />
-    <ClCompile Include="..\editlib\splash.cpp" />
     <ClCompile Include="..\editlib\sql.cpp" />
     <ClCompile Include="..\editlib\statbar.cpp" />
     <ClCompile Include="..\editlib\string_util.cpp">
@@ -608,7 +615,6 @@
     <ClInclude Include="..\editlib\crystallineparser.h" />
     <ClInclude Include="..\editlib\memcombo.h" />
     <ClInclude Include="..\editlib\registry.h" />
-    <ClInclude Include="..\editlib\splash.h" />
     <ClInclude Include="..\editlib\statbar.h" />
     <ClInclude Include="..\editlib\string_util.h" />
     <ClInclude Include="..\editlib\SyntaxColors.h" />

diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj.filters b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj.filters
index e01b800..6cef6c4 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj.filters
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2019.vcxproj.filters
@@ -96,9 +96,6 @@
     <ClCompile Include="..\editlib\registry.cpp">
       <Filter>editlib</Filter>
     </ClCompile>
-    <ClCompile Include="..\editlib\splash.cpp">
-      <Filter>editlib</Filter>
-    </ClCompile>
     <ClCompile Include="..\editlib\statbar.cpp">
       <Filter>editlib</Filter>
     </ClCompile>
@@ -331,9 +328,6 @@
     <ClInclude Include="..\editlib\registry.h">
       <Filter>editlib</Filter>
     </ClInclude>
-    <ClInclude Include="..\editlib\splash.h">
-      <Filter>editlib</Filter>
-    </ClInclude>
     <ClInclude Include="..\editlib\statbar.h">
       <Filter>editlib</Filter>
     </ClInclude>

diff --git a/Externals/crystaledit/editlib/splash.cpp b/Externals/crystaledit/editlib/splash.cpp
deleted file mode 100644 (file)
index bab2265..0000000
--- a/Externals/crystaledit/editlib/splash.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-#include "StdAfx.h"
-#include "editcmd.h"
-#include "splash.h"
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char BASED_CODE THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CSplashWnd dialog
-
-BOOL CSplashWnd::Create(CWnd* pParent)
-{
-       //{{AFX_DATA_INIT(CSplashWnd)
-               // NOTE: the ClassWizard will add member initialization here
-       //}}AFX_DATA_INIT
-
-       if (!CDialog::Create(CSplashWnd::IDD, pParent))
-       {
-               TRACE0("Warning: creation of CSplashWnd dialog failed\n");
-               return false;
-       }
-
-       return true;
-}
-
-BOOL CSplashWnd::OnInitDialog()
-{
-       CDialog::OnInitDialog();
-       CenterWindow();
-
-       // initialize the big icon control
-       m_icon.SubclassDlgItem(IDC_BIGICON, this);
-       m_icon.SizeToContent();
-
-       return true;  // return true  unless you set the focus to a control
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CSplashWnd message handlers
-
-/////////////////////////////////////////////////////////////////////////////
-// CBigIcon
-
-BEGIN_MESSAGE_MAP(CBigIcon, CButton)
-       //{{AFX_MSG_MAP(CBigIcon)
-       ON_WM_DRAWITEM()
-       ON_WM_ERASEBKGND()
-       //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CBigIcon message handlers
-
-#define CY_SHADOW   4
-#define CX_SHADOW   4
-
-void CBigIcon::SizeToContent()
-{
-       m_bitmap.LoadBitmap(IDB_BITMAP48);
-       BITMAP bm;
-       m_bitmap.GetObject(sizeof(bm), &bm);
-       m_sizeBitmap = CSize(bm.bmWidth, bm.bmHeight);
-       // get system icon size
-
-       // a big icon should be twice the size of an icon + shadows
-       SetWindowPos(NULL, 0, 0, bm.bmWidth + CX_SHADOW + 4, bm.bmHeight + CY_SHADOW + 4,
-               SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
-}
-
-void CBigIcon::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct)
-{
-       CDC* pDC = CDC::FromHandle(lpDrawItemStruct->hDC);
-       ASSERT(pDC != NULL);
-
-       CRect rect;
-       GetClientRect(rect);
-       int cxClient = rect.Width();
-       int cyClient = rect.Height();
-
-       // draw border around icon
-       CPen pen;
-       pen.CreateStockObject(BLACK_PEN);
-       CPen* pPenOld = pDC->SelectObject(&pen);
-       pDC->Rectangle(0, 0, cxClient-CX_SHADOW, cyClient-CY_SHADOW);
-       if (pPenOld)
-               pDC->SelectObject(pPenOld);
-
-       // draw shadows around icon
-       CBrush br;
-       br.CreateStockObject(DKGRAY_BRUSH);
-       rect.SetRect(cxClient-CX_SHADOW, CY_SHADOW, cxClient, cyClient);
-       pDC->FillRect(rect, &br);
-       rect.SetRect(CX_SHADOW, cyClient-CY_SHADOW, cxClient, cyClient);
-       pDC->FillRect(rect, &br);
-
-       // draw the bitmap contents
-       CDC dcMem;
-       if (!dcMem.CreateCompatibleDC(pDC))
-               return;
-       CBitmap* pBitmapOld = dcMem.SelectObject(&m_bitmap);
-       if (pBitmapOld == NULL)
-               return;
-
-       pDC->BitBlt(2, 2, m_sizeBitmap.cx, m_sizeBitmap.cy, &dcMem, 0, 0, SRCCOPY);
-
-       dcMem.SelectObject(pBitmapOld);
-}
-
-BOOL CBigIcon::OnEraseBkgnd(CDC*)
-{
-       return true;    // we don't do any erasing...
-}
-
-/////////////////////////////////////////////////////////////////////////////

diff --git a/Externals/crystaledit/editlib/splash.h b/Externals/crystaledit/editlib/splash.h
deleted file mode 100644 (file)
index 6bed138..0000000
--- a/Externals/crystaledit/editlib/splash.h
+++ /dev/null
@@ -1,53 +0,0 @@
-
-#pragma once
-
-/////////////////////////////////////////////////////////////////////////////
-// CBigIcon window
-
-class EDITPADC_CLASS CBigIcon : public CButton
-{
-// Attributes
-public:
-       CBitmap m_bitmap;
-       CSize m_sizeBitmap;
-
-// Operations
-public:
-       void SizeToContent();
-
-// Implementation
-protected:
-       virtual void DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct);
-
-       //{{AFX_MSG(CBigIcon)
-       afx_msg BOOL OnEraseBkgnd(CDC* pDC);
-       //}}AFX_MSG
-       DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// CSplash dialog
-
-class EDITPADC_CLASS CSplashWnd : public CDialog
-{
-// Construction
-public:
-       BOOL Create(CWnd* pParent);
-
-// Dialog Data
-       //{{AFX_DATA(CSplashWnd)
-       enum { IDD = IDD_SPLASH };
-               // NOTE: the ClassWizard will add data members here
-       //}}AFX_DATA
-
-// Implementation
-protected:
-       CBigIcon m_icon; // self-draw button
-
-       // Generated message map functions
-       //{{AFX_MSG(CSplashWnd)
-       virtual BOOL OnInitDialog();
-       //}}AFX_MSG
-};
-
-/////////////////////////////////////////////////////////////////////////////