Reverted changes to themed controls - it wasn't working

Author: nickgammon

MUSHclient.cpp

@@ -1184,9 +1184,6 @@ void CMUSHclientApp::RestoreColumnConfiguration (LPCTSTR strName,
 
   } // end of RestoreColumnConfiguration
 
-extern HMODULE HModUXT;
-#define THEMEGLUE_FREE() if (HModUXT != NULL) { FreeLibrary(HModUXT); HModUXT = NULL; }
-
 int CMUSHclientApp::ExitInstance() 
 {
   if (!bWine)
@@ -1221,8 +1218,6 @@ int CMUSHclientApp::ExitInstance()
   if (db)
     sqlite3_close(db);
 
-  THEMEGLUE_FREE ();
-
   bc_free_numbers ();  // free zero, one, two
 
   // free the resources DLL

TextView.cpp

@@ -1718,138 +1718,24 @@ pCmdUI->Enable ();
 }
 
 
-#if _MSC_VER < 1400 
-
-#define VERSION_6		MAKELONG(0, 6)
-
-// from Worstje
-
-void CTextView::Serialize(CArchive& ar)
-	// Read and write CTextView object to archive, with length prefix.
-{
-	ASSERT_VALID(this);
-	ASSERT(m_hWnd != NULL);
-	if (ar.IsStoring())
-	{
-		UINT nLen = GetBufferLength();
-		ar << (DWORD)nLen;
-		WriteToArchive(ar);
-	}
-	else
-	{
-		DWORD dwLen;
-		ar >> dwLen;
-		if (dwLen > GetEditCtrl().GetLimitText())
-			// Larger than edit control limit. Call SetLimitText() to set your own max size.
-			// Refer to documentation for EM_LIMITTEXT for max sizes for your target OS.
-			AfxThrowArchiveException(CArchiveException::badIndex);
-		UINT nLen = (UINT)dwLen;
-		ReadFromArchive(ar, nLen);
-	}
-	ASSERT_VALID(this);
-}
-
-void CTextView::ReadFromArchive(CArchive& ar, UINT nLen)
-	// Read certain amount of text from the file, assume at least nLen
-	// characters (not bytes) are in the file.
-{
-	ASSERT_VALID(this);
-
-  LPVOID hText = LocalAlloc(LMEM_MOVEABLE, (nLen+1)*sizeof(TCHAR));
-
-	//LPVOID hText = LocalAlloc(LMEM_MOVEABLE, static_cast<UINT>(::ATL::AtlMultiplyThrow(static_cast<UINT>(nLen+1),static_cast<UINT>(sizeof(TCHAR)))));
-	if (hText == NULL)
-		AfxThrowMemoryException();
-
-	LPTSTR lpszText = (LPTSTR)LocalLock(hText);
-	ASSERT(lpszText != NULL);
-	if (ar.Read(lpszText, nLen*sizeof(TCHAR)) != nLen*sizeof(TCHAR))
-	{
-		LocalUnlock(hText);
-		LocalFree(hText);
-		AfxThrowArchiveException(CArchiveException::endOfFile);
-	}
-	// Replace the editing edit buffer with the newly loaded data
-	lpszText[nLen] = '\0';
-
-	
-#ifndef _UNICODE
-	if (_AfxGetComCtlVersion() >= VERSION_6)
-	{
-		// set the text with SetWindowText, then free
-		BOOL bResult = ::SetWindowText(m_hWnd, lpszText);
-		LocalUnlock(hText);
-		LocalFree(hText);
-
-		// make sure that SetWindowText was successful
-		if (!bResult || ::GetWindowTextLength(m_hWnd) < (int)nLen)
-			AfxThrowMemoryException();
-
-		// remove old shadow buffer
-		delete[] m_pShadowBuffer;
-		m_pShadowBuffer = NULL;
-		m_nShadowSize = 0;
-
-		ASSERT_VALID(this);
-		return;
-	}
-#endif
-
-	LocalUnlock(hText);
-	HLOCAL hOldText = GetEditCtrl().GetHandle();
-	ASSERT(hOldText != NULL);
-	LocalFree(hOldText);
-	GetEditCtrl().SetHandle((HLOCAL)hText);
-	Invalidate();
-	ASSERT_VALID(this);
-}
-
-void CTextView::WriteToArchive(CArchive& ar)
-	// Write just the text to an archive, no length prefix.
-{
-	ASSERT_VALID(this);
-	LPCTSTR lpszText = LockBuffer();
-	ASSERT(lpszText != NULL);
-	UINT nLen = GetBufferLength();
-	TRY
-	{
-		ar.Write(lpszText, nLen*sizeof(TCHAR));
-	}
-	CATCH_ALL(e)
-	{
-		UnlockBuffer();
-		THROW_LAST();
-	}
-	END_CATCH_ALL
-	UnlockBuffer();
-	ASSERT_VALID(this);
-}
-
-#endif //  _MSC_VER < 1400 
-
 void CTextView::SerializeRaw(CArchive& ar)
-	// Read/Write object as stand-alone file.
+       // Read/Write object as stand-alone file.
 {
-	ASSERT_VALID(this);
-	if (ar.IsStoring())
-	{
-		WriteToArchive(ar);
-	}
-	else
-	{
-		CFile* pFile = ar.GetFile();
-		ASSERT(pFile->GetPosition() == 0);
-		ULONGLONG nFileSize = pFile->GetLength();
-		if (nFileSize/sizeof(TCHAR) > GetEditCtrl().GetLimitText())
-		{
-			// Larger than edit control limit. Call SetLimitText() to set your own max size.
-			// Refer to documentation for EM_LIMITTEXT for max sizes for your target OS.
-			AfxMessageBox(AFX_IDP_FILE_TOO_LARGE);
-			AfxThrowUserException();
-		}
-		// ReadFromArchive takes the number of characters as argument
-		ReadFromArchive(ar, (UINT)nFileSize/sizeof(TCHAR));
-	}
-	ASSERT_VALID(this);
-}
+       ASSERT_VALID(this);
+
+       if (ar.IsStoring())
+       {
+               WriteToArchive(ar);
+       }
+       else
+       {
+               CFile* pFile = ar.GetFile();
+               ASSERT(pFile->GetPosition() == 0);
+               DWORD nFileSize = pFile->GetLength();
+               // ReadFromArchive takes the number of characters as argument
+               ReadFromArchive(ar, (UINT)nFileSize/sizeof(TCHAR));
+       }
+       ASSERT_VALID(this);
+} /* end of CTextView::SerializeRaw */
+
 

TextView.h

@@ -51,12 +51,6 @@ class CTextView : public CEditView
                      const int sourcelen,
                      CString & result,
                      int & count);
-
-#if _MSC_VER < 1400 
-  virtual void Serialize(CArchive& ar);
-  virtual void ReadFromArchive(CArchive& ar, UINT nLen);
-  virtual void WriteToArchive(CArchive& ar);
-#endif //  _MSC_VER < 1400 
 
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CTextView)

dialogs/world_prefs/TreePropertySheet.cpp

@@ -17,8 +17,6 @@ static char THIS_FILE[] = __FILE__;
 #define SPACEBOTTOM	15
 #define CAPTIONHEIGHT 20
 
-HMODULE HModUXT = NULL;
-#include "themeglue.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CTreePropertySheet
@@ -274,8 +272,6 @@ BOOL CTreePropertySheet::OnInitDialog()
 {
 	CPropertySheet::OnInitDialog();
 
-  ThemeGlue_EnableThemeDialogTexture(m_hWnd, ETDT_ENABLETAB);
-
 	if(m_bSpecialCaption) {
 		CRect	rcWindow;
 

dialogs/world_prefs/themeglue.h

@@ -85,7 +85,8 @@ Section "-MUSHclient program (required)"
   File "Readme.txt" ; in install directory
 
   File "..\WinRel\mushclient.exe"
-  File "..\MUSHclient.exe.manifest"
+  ; File "..\MUSHclient.exe.manifest"
+
   File "..\WinRel\lua5.1.dll"
   File "..\lua5.1.lib"
   File "..\mushclient.HLP"
@@ -501,7 +502,7 @@ Section Uninstall
 
   ; program
   Delete "$INSTDIR\MUSHclient.exe"
-  Delete "$INSTDIR\MUSHclient.exe.manifest"
+  ; Delete "$INSTDIR\MUSHclient.exe.manifest"
   Delete "$INSTDIR\StatusBar.exe"
   Delete "$INSTDIR\lua5.1.dll"
   Delete "$INSTDIR\lua5.1.lib"

install/mushclient.nsi

@@ -854,18 +854,3 @@ typedef struct
   #define BIF_NEWDIALOGSTYLE 0x00000040
 #endif 
 
-/* Manifest instructions for the linker.
- * Originally there is an '#IFDEF _UNICODE' statement around these pragmas, but we don't compile as _UNICODE.
- * Research shows this #IFDEF seems to exist by default due to a bug in CEditView in MBCS mode, but I do not
- * believe this bug can affect us at present as it involves 'loading from files'. Testing thus far seems to
- * confirm there is no different behaviour in/around the command window with this enabled. -JW
- */
-#if _MSC_VER > 1400    // doesn't work with Visual Studio 6
-  #if defined _M_IX86
-    #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
-  #elif defined _M_X64
-    #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='amd64' publicKeyToken='6595b64144ccf1df' language='*'\"")
-  #else
-    #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
-  #endif
-#endif //  _MSC_VER > 1400