Remove obsolete MSVC version tests.
Don't compare __VISUALC__ with versions 1200 (VC6) and earlier, such tests are always true or always false now that we don't support VC6 any more, so just remove them simplifying the code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,8 +18,7 @@
|
||||
* support a way to do that.
|
||||
*/
|
||||
|
||||
/* VC++ 5 didn't include oleacc.lib, though it came with the PSDK */
|
||||
#if defined __VISUALC__ && (wxUSE_ACCESSIBILITY || __VISUALC__ >= 1200)
|
||||
#if defined __VISUALC__ && wxUSE_ACCESSIBILITY
|
||||
#pragma comment(lib, "oleacc")
|
||||
#endif
|
||||
|
||||
|
@@ -141,74 +141,6 @@
|
||||
#define QS_ALLPOSTMESSAGE 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* The following are required for VC++ 5 when the PSDK is not available.
|
||||
*/
|
||||
|
||||
#if defined __VISUALC__ && __VISUALC__ <= 1100
|
||||
|
||||
#ifndef VER_NT_WORKSTATION
|
||||
|
||||
typedef struct _OSVERSIONINFOEXA {
|
||||
DWORD dwOSVersionInfoSize;
|
||||
DWORD dwMajorVersion;
|
||||
DWORD dwMinorVersion;
|
||||
DWORD dwBuildNumber;
|
||||
DWORD dwPlatformId;
|
||||
CHAR szCSDVersion[128];
|
||||
WORD wServicePackMajor;
|
||||
WORD wServicePackMinor;
|
||||
WORD wSuiteMask;
|
||||
BYTE wProductType;
|
||||
BYTE wReserved;
|
||||
} OSVERSIONINFOEXA, *POSVERSIONINFOEXA, *LPOSVERSIONINFOEXA;
|
||||
typedef struct _OSVERSIONINFOEXW {
|
||||
DWORD dwOSVersionInfoSize;
|
||||
DWORD dwMajorVersion;
|
||||
DWORD dwMinorVersion;
|
||||
DWORD dwBuildNumber;
|
||||
DWORD dwPlatformId;
|
||||
WCHAR szCSDVersion[128];
|
||||
WORD wServicePackMajor;
|
||||
WORD wServicePackMinor;
|
||||
WORD wSuiteMask;
|
||||
BYTE wProductType;
|
||||
BYTE wReserved;
|
||||
} OSVERSIONINFOEXW, *POSVERSIONINFOEXW, *LPOSVERSIONINFOEXW;
|
||||
|
||||
#ifdef UNICODE
|
||||
typedef OSVERSIONINFOW OSVERSIONINFO,*POSVERSIONINFO,*LPOSVERSIONINFO;
|
||||
typedef OSVERSIONINFOEXW OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX;
|
||||
#else
|
||||
typedef OSVERSIONINFOA OSVERSIONINFO,*POSVERSIONINFO,*LPOSVERSIONINFO;
|
||||
typedef OSVERSIONINFOEXA OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX;
|
||||
#endif
|
||||
|
||||
#endif // defined VER_NT_WORKSTATION
|
||||
|
||||
#ifndef CP_SYMBOL
|
||||
#define CP_SYMBOL 42
|
||||
#endif
|
||||
|
||||
// NMLVCUSTOMDRAW originally didn't have the iSubItem member. It was added
|
||||
// with IE4, as was IPN_FIRST which is used as a test :-(.
|
||||
//
|
||||
#ifndef IPN_FIRST
|
||||
|
||||
typedef struct wxtagNMLVCUSTOMDRAW_ {
|
||||
NMCUSTOMDRAW nmcd;
|
||||
COLORREF clrText;
|
||||
COLORREF clrTextBk;
|
||||
int iSubItem;
|
||||
} wxNMLVCUSTOMDRAW_, *wxLPNMLVCUSTOMDRAW_;
|
||||
|
||||
#define NMLVCUSTOMDRAW wxNMLVCUSTOMDRAW_
|
||||
#define LPNMLVCUSTOMDRAW wxLPNMLVCUSTOMDRAW_
|
||||
|
||||
#endif // defined IPN_FIRST
|
||||
|
||||
#endif // defined __VISUALC__ && __VISUALC__ <= 1100
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// menu stuff
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -22,7 +22,7 @@
|
||||
// use debug CRT functions for memory leak detections in VC++ 5.0+ in debug
|
||||
// builds
|
||||
#undef wxUSE_VC_CRTDBG
|
||||
#if defined(_DEBUG) && defined(__VISUALC__) && (__VISUALC__ >= 1000) \
|
||||
#if defined(_DEBUG) && defined(__VISUALC__) \
|
||||
&& !defined(UNDER_CE)
|
||||
// it doesn't combine well with wxWin own memory debugging methods
|
||||
#if !wxUSE_GLOBAL_MEMORY_OPERATORS && !wxUSE_MEMORY_TRACING && !defined(__NO_VC_CRTDBG__)
|
||||
|
@@ -191,7 +191,7 @@ private:
|
||||
// VZ: I don't know it's not done for compilers other than VC++ but I leave it
|
||||
// as is. Please note, though, that tracing OLE interface calls may be
|
||||
// incredibly useful when debugging OLE programs.
|
||||
#if defined(__WXDEBUG__) && (( defined(__VISUALC__) && (__VISUALC__ >= 1000) ))
|
||||
#if defined(__WXDEBUG__) && defined(__VISUALC__)
|
||||
// ----------------------------------------------------------------------------
|
||||
// All OLE specific log functions have DebugTrace level (as LogTrace)
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -18,7 +18,7 @@
|
||||
extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs);
|
||||
|
||||
// helper macro for wxSEH_HANDLE
|
||||
#if defined(__BORLANDC__) || (defined(__VISUALC__) && (__VISUALC__ <= 1200))
|
||||
#if defined(__BORLANDC__)
|
||||
// some compilers don't understand that this code is unreachable and warn
|
||||
// about no value being returned from the function without it, so calm them
|
||||
// down
|
||||
|
@@ -33,9 +33,6 @@ class WXDLLIMPEXP_CORE wxWindowMSW : public wxWindowBase
|
||||
friend class wxSpinCtrl;
|
||||
friend class wxSlider;
|
||||
friend class wxRadioBox;
|
||||
#if defined __VISUALC__ && __VISUALC__ <= 1200
|
||||
friend class wxWindowMSW;
|
||||
#endif
|
||||
public:
|
||||
wxWindowMSW() { Init(); }
|
||||
|
||||
|
Reference in New Issue
Block a user