Remove MSVC6 support.
Don't support this compiler any more, this allows to get rid of tons of MSVC6-specific workarounds, in particular we can now use Bind() and natural template functions calls in the library code. Also remove MSVC6 project and solution files and don't generate them when bakefile_gen is ran any more (removing the remaining occurrences of msvc6prj from the bakefiles results in weird bake-time errors, so it's simpler to just leave them there). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -680,27 +680,19 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event )
|
||||
if ( value.IsNull() )
|
||||
return;
|
||||
|
||||
//
|
||||
// FIXME-VC6: In order to compile on Visual C++ 6.0, wxANY_AS()
|
||||
// macro is used. Unless you want to support this old
|
||||
// compiler in your own code, you can use the more
|
||||
// nicer form value.As<FOO>() instead of
|
||||
// wxANY_AS(value, FOO).
|
||||
//
|
||||
|
||||
// Some settings are disabled outside Windows platform
|
||||
if ( name == wxT("X") )
|
||||
SetSize( wxANY_AS(value, int), -1, -1, -1, wxSIZE_USE_EXISTING );
|
||||
SetSize( value.As<int>(), -1, -1, -1, wxSIZE_USE_EXISTING );
|
||||
else if ( name == wxT("Y") )
|
||||
// wxPGVariantToInt is safe long int value getter
|
||||
SetSize ( -1, wxANY_AS(value, int), -1, -1, wxSIZE_USE_EXISTING );
|
||||
SetSize ( -1, value.As<int>(), -1, -1, wxSIZE_USE_EXISTING );
|
||||
else if ( name == wxT("Width") )
|
||||
SetSize ( -1, -1, wxANY_AS(value, int), -1, wxSIZE_USE_EXISTING );
|
||||
SetSize ( -1, -1, value.As<int>(), -1, wxSIZE_USE_EXISTING );
|
||||
else if ( name == wxT("Height") )
|
||||
SetSize ( -1, -1, -1, wxANY_AS(value, int), wxSIZE_USE_EXISTING );
|
||||
SetSize ( -1, -1, -1, value.As<int>(), wxSIZE_USE_EXISTING );
|
||||
else if ( name == wxT("Label") )
|
||||
{
|
||||
SetTitle( wxANY_AS(value, wxString) );
|
||||
SetTitle( value.As<wxString>() );
|
||||
}
|
||||
else if ( name == wxT("Password") )
|
||||
{
|
||||
@@ -714,7 +706,7 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event )
|
||||
else
|
||||
if ( name == wxT("Font") )
|
||||
{
|
||||
wxFont font = wxANY_AS(value, wxFont);
|
||||
wxFont font = value.As<wxFont>();
|
||||
wxASSERT( font.IsOk() );
|
||||
|
||||
m_pPropGridManager->SetFont( font );
|
||||
@@ -722,22 +714,22 @@ void FormMain::OnPropertyGridChange( wxPropertyGridEvent& event )
|
||||
else
|
||||
if ( name == wxT("Margin Colour") )
|
||||
{
|
||||
wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue);
|
||||
wxColourPropertyValue cpv = value.As<wxColourPropertyValue>();
|
||||
m_pPropGridManager->GetGrid()->SetMarginColour( cpv.m_colour );
|
||||
}
|
||||
else if ( name == wxT("Cell Colour") )
|
||||
{
|
||||
wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue);
|
||||
wxColourPropertyValue cpv = value.As<wxColourPropertyValue>();
|
||||
m_pPropGridManager->GetGrid()->SetCellBackgroundColour( cpv.m_colour );
|
||||
}
|
||||
else if ( name == wxT("Line Colour") )
|
||||
{
|
||||
wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue);
|
||||
wxColourPropertyValue cpv = value.As<wxColourPropertyValue>();
|
||||
m_pPropGridManager->GetGrid()->SetLineColour( cpv.m_colour );
|
||||
}
|
||||
else if ( name == wxT("Cell Text Colour") )
|
||||
{
|
||||
wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue);
|
||||
wxColourPropertyValue cpv = value.As<wxColourPropertyValue>();
|
||||
m_pPropGridManager->GetGrid()->SetCellTextColour( cpv.m_colour );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,180 +0,0 @@
|
||||
# Microsoft Developer Studio Project File - Name="propgrid" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Application" 0x0101
|
||||
|
||||
CFG=propgrid - Win32 Debug
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "propgrid.mak".
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "propgrid.mak" CFG="propgrid - Win32 Debug"
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "propgrid - Win32 DLL Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "propgrid - Win32 DLL Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "propgrid - Win32 Release" (based on "Win32 (x86) Application")
|
||||
!MESSAGE "propgrid - Win32 Debug" (based on "Win32 (x86) Application")
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
# PROP AllowPerConfigDependencies 0
|
||||
# PROP Scc_ProjName ""
|
||||
# PROP Scc_LocalPath ""
|
||||
CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "propgrid - Win32 DLL Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "vc_mswudll"
|
||||
# PROP BASE Intermediate_Dir "vc_mswudll\propgrid"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "vc_mswudll"
|
||||
# PROP Intermediate_Dir "vc_mswudll\propgrid"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
|
||||
# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
|
||||
# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
|
||||
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 wxmsw31u_propgrid.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\propgrid.exe" /debug /pdb:"vc_mswudll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
|
||||
# ADD LINK32 wxmsw31u_propgrid.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\propgrid.exe" /debug /pdb:"vc_mswudll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
|
||||
|
||||
!ELSEIF "$(CFG)" == "propgrid - Win32 DLL Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "vc_mswuddll"
|
||||
# PROP BASE Intermediate_Dir "vc_mswuddll\propgrid"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "vc_mswuddll"
|
||||
# PROP Intermediate_Dir "vc_mswuddll\propgrid"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
|
||||
# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
|
||||
# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
|
||||
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 wxmsw31ud_propgrid.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\propgrid.exe" /debug /pdb:"vc_mswuddll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
|
||||
# ADD LINK32 wxmsw31ud_propgrid.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\propgrid.exe" /debug /pdb:"vc_mswuddll\propgrid.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
|
||||
|
||||
!ELSEIF "$(CFG)" == "propgrid - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "vc_mswu"
|
||||
# PROP BASE Intermediate_Dir "vc_mswu\propgrid"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "vc_mswu"
|
||||
# PROP Intermediate_Dir "vc_mswu\propgrid"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
|
||||
# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
|
||||
# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
|
||||
# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 wxmsw31u_propgrid.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\propgrid.exe" /debug /pdb:"vc_mswu\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
|
||||
# ADD LINK32 wxmsw31u_propgrid.lib wxmsw31u_adv.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\propgrid.exe" /debug /pdb:"vc_mswu\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
|
||||
|
||||
!ELSEIF "$(CFG)" == "propgrid - Win32 Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "vc_mswud"
|
||||
# PROP BASE Intermediate_Dir "vc_mswud\propgrid"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "vc_mswud"
|
||||
# PROP Intermediate_Dir "vc_mswud\propgrid"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
|
||||
# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\propgrid.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
|
||||
# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
|
||||
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 wxmsw31ud_propgrid.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\propgrid.exe" /debug /pdb:"vc_mswud\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
|
||||
# ADD LINK32 wxmsw31ud_propgrid.lib wxmsw31ud_adv.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\propgrid.exe" /debug /pdb:"vc_mswud\propgrid.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "propgrid - Win32 DLL Release"
|
||||
# Name "propgrid - Win32 DLL Debug"
|
||||
# Name "propgrid - Win32 Release"
|
||||
# Name "propgrid - Win32 Debug"
|
||||
# Begin Group "Source Files"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\propgrid.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\propgrid_minimal.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\..\sample.rc
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\sampleprops.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\tests.cpp
|
||||
# End Source File
|
||||
# End Group
|
||||
# Begin Group "Header Files"
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\propgrid.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\sampleprops.h
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
# End Project
|
||||
|
||||
@@ -515,7 +515,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
|
||||
wxDateTime testTime = wxDateTime::Now();
|
||||
any = testTime;
|
||||
prop->SetValue(any);
|
||||
if ( wxANY_AS(prop->GetValue().GetAny(), wxDateTime) != testTime )
|
||||
if ( prop->GetValue().GetAny().As<wxDateTime>() != testTime )
|
||||
RT_FAILURE();
|
||||
#endif
|
||||
|
||||
@@ -523,10 +523,10 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
|
||||
int testInt = 25537983;
|
||||
any = testInt;
|
||||
prop->SetValue(any);
|
||||
if ( wxANY_AS(prop->GetValue().GetAny(), int) != testInt )
|
||||
if ( prop->GetValue().GetAny().As<int>() != testInt )
|
||||
RT_FAILURE();
|
||||
#ifdef wxLongLong_t
|
||||
if ( wxANY_AS(prop->GetValue().GetAny(), wxLongLong_t) != testInt )
|
||||
if ( prop->GetValue().GetAny().As<wxLongLong_t>() != testInt )
|
||||
RT_FAILURE();
|
||||
#endif
|
||||
|
||||
@@ -534,7 +534,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
|
||||
wxString testString = "asd934jfyn3";
|
||||
any = testString;
|
||||
prop->SetValue(any);
|
||||
if ( wxANY_AS(prop->GetValue().GetAny(), wxString) != testString )
|
||||
if ( prop->GetValue().GetAny().As<wxString>() != testString )
|
||||
RT_FAILURE();
|
||||
|
||||
// Test with a type generated with IMPLEMENT_VARIANT_OBJECT()
|
||||
@@ -542,7 +542,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
|
||||
wxColour testCol = *wxCYAN;
|
||||
any = testCol;
|
||||
prop->SetValue(any);
|
||||
if ( wxANY_AS(prop->GetValue().GetAny(), wxColour) != testCol )
|
||||
if ( prop->GetValue().GetAny().As<wxColour>() != testCol )
|
||||
RT_FAILURE();
|
||||
|
||||
// Test with a type with custom wxVariantData defined by
|
||||
@@ -551,7 +551,7 @@ bool FormMain::RunTests( bool fullTest, bool interactive )
|
||||
wxPoint testPoint(199, 199);
|
||||
any = testPoint;
|
||||
prop->SetValue(any);
|
||||
if ( wxANY_AS(prop->GetValue().GetAny(), wxPoint) != testPoint )
|
||||
if ( prop->GetValue().GetAny().As<wxPoint>() != testPoint )
|
||||
RT_FAILURE();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user