Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove MSVC6 support.

Browse Source 
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
2014-05-15 22:32:17 +00:00
parent 28f9670787
commit f4b80e5337
289 changed files with 394 additions and 38949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
samples/propgrid/propgrid.cpp
View File

@@ -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 );
}
}