Attachment #490948 for bug #163007





			// Create a clone of now-converted object tree, so it can be linked
			// underneath the root element
			std::unique_ptr<ticpp::Node> objectTree = root->Clone();

			// Clear the document to add the declatation and the root element
			doc.Clear();

			m_warnOnAdditionsUpdate = false;
			wxLogWarning( _("Updated classes from wxAdditions. You must use the latest version of wxAdditions to continue.\nNote wxScintilla is now wxStyledListCtrl, wxTreeListCtrl is now wxadditions::wxTreeListCtrl, and wxTreeListCtrlColumn is now wxadditions::wxTreeListCtrlColumn") );
		}

		typedef std::map< std::string, std::set< std::string > > PropertiesToRemove;

		static std::set< std::string > propertyRemovalWarnings;

				std::stringstream ss;
				std::ostream_iterator< std::string > out_it (ss, ", ");
				std::copy( it->second.begin(), it->second.end(), out_it );

				wxLogMessage( _("Removed properties for class %s because they are no longer supported: %s"), objClass, ss.str() );
				propertyRemovalWarnings.insert( objClass );
			}

		}
	}
}

void ApplicationData::RemoveProperties( ticpp::Node* parent, const std::set< std::string >& names )
{
	ticpp::Iterator< ticpp::Element > prop( "property" );

	{
		ticpp::Element element = *prop;
		++prop;

		std::string name;
		element.GetAttribute( "name", &name );

		if ( names.find( name ) != names.end() )
		{
			parent->RemoveChild( &element );
		}
	}
}

void ApplicationData::TransferOptionList( ticpp::Element* prop, std::set< wxString >* options, const std::string& newPropName )

		propertiesToRemove[ "Dialog" ].insert( "validator_style" );
		propertiesToRemove[ "Dialog" ].insert( "validator_type" );
		propertiesToRemove[ "Dialog" ].insert( "aui_name" );

		propertiesToRemove[ "Panel" ].insert( "BottomDockable" );
		propertiesToRemove[ "Panel" ].insert( "LeftDockable" );
		propertiesToRemove[ "Panel" ].insert( "RightDockable" );

		propertiesToRemove[ "Panel" ].insert( "show" );
		propertiesToRemove[ "Panel" ].insert( "toolbar_pane" );
		propertiesToRemove[ "Panel" ].insert( "validator_style" );
		propertiesToRemove[ "Panel" ].insert( "validator_type" );

		propertiesToRemove[ "wxStaticText" ].insert( "validator_style" );
		propertiesToRemove[ "wxStaticText" ].insert( "validator_type" );
		propertiesToRemove[ "CustomControl" ].insert( "validator_style" );

		propertiesToRemove[ "wxAuiNotebook" ].insert( "validator_style" );
		propertiesToRemove[ "wxAuiNotebook" ].insert( "validator_type" );
		propertiesToRemove[ "wxPanel" ].insert( "validator_style" );
		propertiesToRemove[ "wxPanel" ].insert( "validator_type" );
		propertiesToRemove[ "wxToolBar" ].insert( "validator_style" );
		propertiesToRemove[ "wxToolBar" ].insert( "validator_type" );
		propertiesToRemove[ "wxStyledTextCtrl" ].insert( "use_wxAddition" );
		propertiesToRemove[ "wxStyledTextCtrl" ].insert( "validator_style" );
		propertiesToRemove[ "wxStyledTextCtrl" ].insert( "validator_type" );
		propertiesToRemove[ "wxPropertyGridManager" ].insert( "use_wxAddition" );
		propertiesToRemove[ "wxPropertyGridManager" ].insert( "validator_style" );
		propertiesToRemove[ "wxPropertyGridManager" ].insert( "validator_type" );

		propertiesToRemove[ "wxadditions::wxTreeListCtrl" ].insert( "validator_style" );
		propertiesToRemove[ "wxadditions::wxTreeListCtrl" ].insert( "validator_type" );
	}
	return propertiesToRemove;
}




		}
	}

	std::unique_ptr<wxSingleInstanceChecker> checker;
    {
        // Suspend logging, because error messages here are not useful
        #ifndef __WXFB_DEBUG__

		// This is the first instance of this project, so setup a server and save the single instance checker
		if ( CreateServer( name ) )
		{
			m_checker = std::move(checker);
			return true;
		}
		else

		}

		// Create the client
		std::unique_ptr<AppClient> client(new AppClient);

		// Create the connection
		std::unique_ptr<wxConnectionBase> connection;
		#ifdef __WXMSW__
			connection.reset( client->MakeConnection( wxT("localhost"), name, name ) );
		#else

	wxLogNull stopLogging;
	#endif

	auto server = std::unique_ptr<AppServer>(new AppServer(name));

	#ifdef __WXMSW__
		if ( server->Create( name ) )
		{
			m_server = std::move(server);
			return true;
		}
	#else

			wxString nameWithPort = wxString::Format( wxT("%i%s"), i, name.c_str() );
			if( server->Create( nameWithPort ) )
			{
				m_server = std::move(server);
				return true;
			}
			else

Lines 35-42 class AppServer; Link Here

(-)a/src/utils/wxfbipc.h (-2 / +2 lines)
35	class wxFBIPC	35	class wxFBIPC
36	{	36	{
37	private:	37	private:
38	std::auto_ptr< wxSingleInstanceChecker > m_checker;	38	std::unique_ptr<wxSingleInstanceChecker> m_checker;
39	std::auto_ptr< AppServer > m_server;	39	std::unique_ptr<AppServer> m_server;
40	const int m_port;	40	const int m_port;
41		41
42	bool CreateServer( const wxString& name );	42	bool CreateServer( const wxString& name );

Return to bug 163007

Lines 92-98 bool wxFBIPC::VerifySingleInstance( const wxString& file, bool switchTo ) Link Here

(-)a/src/utils/wxfbipc.cpp (-7 / +7 lines)
92	}	92	}
93	}	93	}
94		94
95	std::auto_ptr< wxSingleInstanceChecker > checker;	95	std::unique_ptr<wxSingleInstanceChecker> checker;
96	{	96	{
97	// Suspend logging, because error messages here are not useful	97	// Suspend logging, because error messages here are not useful
98	#ifndef __WXFB_DEBUG__	98	#ifndef __WXFB_DEBUG__
Lines 106-112 bool wxFBIPC::VerifySingleInstance( const wxString& file, bool switchTo ) Link Here
106	// This is the first instance of this project, so setup a server and save the single instance checker	106	// This is the first instance of this project, so setup a server and save the single instance checker
107	if ( CreateServer( name ) )	107	if ( CreateServer( name ) )
108	{	108	{
109	m_checker = checker;	109	m_checker = std::move(checker);
110	return true;	110	return true;
111	}	111	}
112	else	112	else
Lines 135-144 bool wxFBIPC::VerifySingleInstance( const wxString& file, bool switchTo ) Link Here
135	}	135	}
136		136
137	// Create the client	137	// Create the client
138	std::auto_ptr< AppClient > client( new AppClient );	138	std::unique_ptr<AppClient> client(new AppClient);
139		139
140	// Create the connection	140	// Create the connection
141	std::auto_ptr< wxConnectionBase > connection;	141	std::unique_ptr<wxConnectionBase> connection;
142	#ifdef __WXMSW__	142	#ifdef __WXMSW__
143	connection.reset( client->MakeConnection( wxT("localhost"), name, name ) );	143	connection.reset( client->MakeConnection( wxT("localhost"), name, name ) );
144	#else	144	#else
Lines 189-200 bool wxFBIPC::CreateServer( const wxString& name ) Link Here
189	wxLogNull stopLogging;	189	wxLogNull stopLogging;
190	#endif	190	#endif
191		191
192	std::auto_ptr< AppServer > server( new AppServer( name ) );	192	auto server = std::unique_ptr<AppServer>(new AppServer(name));
193		193
194	#ifdef __WXMSW__	194	#ifdef __WXMSW__
195	if ( server->Create( name ) )	195	if ( server->Create( name ) )
196	{	196	{
197	m_server = server;	197	m_server = std::move(server);
198	return true;	198	return true;
199	}	199	}
200	#else	200	#else
Lines 204-210 bool wxFBIPC::CreateServer( const wxString& name ) Link Here
204	wxString nameWithPort = wxString::Format( wxT("%i%s"), i, name.c_str() );	204	wxString nameWithPort = wxString::Format( wxT("%i%s"), i, name.c_str() );
205	if( server->Create( nameWithPort ) )	205	if( server->Create( nameWithPort ) )
206	{	206	{
207	m_server = server;	207	m_server = std::move(server);
208	return true;	208	return true;
209	}	209	}
210	else	210	else

Lines 1407-1413 bool ApplicationData::ConvertProject( const wxString& path, int fileMajor, int f Link Here

(-)a/src/rad/appdata.cpp (-15 / +15 lines)
1407		1407
1408	// Create a clone of now-converted object tree, so it can be linked	1408	// Create a clone of now-converted object tree, so it can be linked
1409	// underneath the root element	1409	// underneath the root element
1410	std::auto_ptr< ticpp::Node > objectTree = root->Clone();	1410	std::unique_ptr<ticpp::Node> objectTree = root->Clone();
1411		1411
1412	// Clear the document to add the declatation and the root element	1412	// Clear the document to add the declatation and the root element
1413	doc.Clear();	1413	doc.Clear();
Lines 1936-1942 void ApplicationData::ConvertObject( ticpp::Element* parent, int fileMajor, int Link Here
1936	m_warnOnAdditionsUpdate = false;	1936	m_warnOnAdditionsUpdate = false;
1937	wxLogWarning( _("Updated classes from wxAdditions. You must use the latest version of wxAdditions to continue.\nNote wxScintilla is now wxStyledListCtrl, wxTreeListCtrl is now wxadditions::wxTreeListCtrl, and wxTreeListCtrlColumn is now wxadditions::wxTreeListCtrlColumn") );	1937	wxLogWarning( _("Updated classes from wxAdditions. You must use the latest version of wxAdditions to continue.\nNote wxScintilla is now wxStyledListCtrl, wxTreeListCtrl is now wxadditions::wxTreeListCtrl, and wxTreeListCtrlColumn is now wxadditions::wxTreeListCtrlColumn") );
1938	}	1938	}
1939		1939
1940	typedef std::map< std::string, std::set< std::string > > PropertiesToRemove;	1940	typedef std::map< std::string, std::set< std::string > > PropertiesToRemove;
1941		1941
1942	static std::set< std::string > propertyRemovalWarnings;	1942	static std::set< std::string > propertyRemovalWarnings;
Lines 1950-1956 void ApplicationData::ConvertObject( ticpp::Element* parent, int fileMajor, int Link Here
1950	std::stringstream ss;	1950	std::stringstream ss;
1951	std::ostream_iterator< std::string > out_it (ss, ", ");	1951	std::ostream_iterator< std::string > out_it (ss, ", ");
1952	std::copy( it->second.begin(), it->second.end(), out_it );	1952	std::copy( it->second.begin(), it->second.end(), out_it );
1953		1953
1954	wxLogMessage( _("Removed properties for class %s because they are no longer supported: %s"), objClass, ss.str() );	1954	wxLogMessage( _("Removed properties for class %s because they are no longer supported: %s"), objClass, ss.str() );
1955	propertyRemovalWarnings.insert( objClass );	1955	propertyRemovalWarnings.insert( objClass );
1956	}	1956	}
Lines 1977-1983 void ApplicationData::GetPropertiesToConvert( ticpp::Node* parent, const std::se Link Here
1977	}	1977	}
1978	}	1978	}
1979	}	1979	}
1980		1980
1981	void ApplicationData::RemoveProperties( ticpp::Node* parent, const std::set< std::string >& names )	1981	void ApplicationData::RemoveProperties( ticpp::Node* parent, const std::set< std::string >& names )
1982	{	1982	{
1983	ticpp::Iterator< ticpp::Element > prop( "property" );	1983	ticpp::Iterator< ticpp::Element > prop( "property" );
Lines 1986-2000 void ApplicationData::RemoveProperties( ticpp::Node* parent, const std::set< std Link Here
1986	{	1986	{
1987	ticpp::Element element = *prop;	1987	ticpp::Element element = *prop;
1988	++prop;	1988	++prop;
1989		1989
1990	std::string name;	1990	std::string name;
1991	element.GetAttribute( "name", &name );	1991	element.GetAttribute( "name", &name );
1992		1992
1993	if ( names.find( name ) != names.end() )	1993	if ( names.find( name ) != names.end() )
1994	{	1994	{
1995	parent->RemoveChild( &element );	1995	parent->RemoveChild( &element );
1996	}	1996	}
1997	}	1997	}
1998	}	1998	}
1999		1999
2000	void ApplicationData::TransferOptionList( ticpp::Element* prop, std::set< wxString >* options, const std::string& newPropName )	2000	void ApplicationData::TransferOptionList( ticpp::Element* prop, std::set< wxString >* options, const std::string& newPropName )
Lines 2909-2915 ApplicationData::PropertiesToRemove& ApplicationData::GetPropertiesToRemove_v1_1 Link Here
2909	propertiesToRemove[ "Dialog" ].insert( "validator_style" );	2909	propertiesToRemove[ "Dialog" ].insert( "validator_style" );
2910	propertiesToRemove[ "Dialog" ].insert( "validator_type" );	2910	propertiesToRemove[ "Dialog" ].insert( "validator_type" );
2911	propertiesToRemove[ "Dialog" ].insert( "aui_name" );	2911	propertiesToRemove[ "Dialog" ].insert( "aui_name" );
2912		2912
2913	propertiesToRemove[ "Panel" ].insert( "BottomDockable" );	2913	propertiesToRemove[ "Panel" ].insert( "BottomDockable" );
2914	propertiesToRemove[ "Panel" ].insert( "LeftDockable" );	2914	propertiesToRemove[ "Panel" ].insert( "LeftDockable" );
2915	propertiesToRemove[ "Panel" ].insert( "RightDockable" );	2915	propertiesToRemove[ "Panel" ].insert( "RightDockable" );
Lines 2932-2939 ApplicationData::PropertiesToRemove& ApplicationData::GetPropertiesToRemove_v1_1 Link Here
2932	propertiesToRemove[ "Panel" ].insert( "show" );	2932	propertiesToRemove[ "Panel" ].insert( "show" );
2933	propertiesToRemove[ "Panel" ].insert( "toolbar_pane" );	2933	propertiesToRemove[ "Panel" ].insert( "toolbar_pane" );
2934	propertiesToRemove[ "Panel" ].insert( "validator_style" );	2934	propertiesToRemove[ "Panel" ].insert( "validator_style" );
2935	propertiesToRemove[ "Panel" ].insert( "validator_type" );	2935	propertiesToRemove[ "Panel" ].insert( "validator_type" );
2936		2936
2937	propertiesToRemove[ "wxStaticText" ].insert( "validator_style" );	2937	propertiesToRemove[ "wxStaticText" ].insert( "validator_style" );
2938	propertiesToRemove[ "wxStaticText" ].insert( "validator_type" );	2938	propertiesToRemove[ "wxStaticText" ].insert( "validator_type" );
2939	propertiesToRemove[ "CustomControl" ].insert( "validator_style" );	2939	propertiesToRemove[ "CustomControl" ].insert( "validator_style" );
Lines 2941-2958 ApplicationData::PropertiesToRemove& ApplicationData::GetPropertiesToRemove_v1_1 Link Here
2941	propertiesToRemove[ "wxAuiNotebook" ].insert( "validator_style" );	2941	propertiesToRemove[ "wxAuiNotebook" ].insert( "validator_style" );
2942	propertiesToRemove[ "wxAuiNotebook" ].insert( "validator_type" );	2942	propertiesToRemove[ "wxAuiNotebook" ].insert( "validator_type" );
2943	propertiesToRemove[ "wxPanel" ].insert( "validator_style" );	2943	propertiesToRemove[ "wxPanel" ].insert( "validator_style" );
2944	propertiesToRemove[ "wxPanel" ].insert( "validator_type" );	2944	propertiesToRemove[ "wxPanel" ].insert( "validator_type" );
2945	propertiesToRemove[ "wxToolBar" ].insert( "validator_style" );	2945	propertiesToRemove[ "wxToolBar" ].insert( "validator_style" );
2946	propertiesToRemove[ "wxToolBar" ].insert( "validator_type" );	2946	propertiesToRemove[ "wxToolBar" ].insert( "validator_type" );
2947	propertiesToRemove[ "wxStyledTextCtrl" ].insert( "use_wxAddition" );	2947	propertiesToRemove[ "wxStyledTextCtrl" ].insert( "use_wxAddition" );
2948	propertiesToRemove[ "wxStyledTextCtrl" ].insert( "validator_style" );	2948	propertiesToRemove[ "wxStyledTextCtrl" ].insert( "validator_style" );
2949	propertiesToRemove[ "wxStyledTextCtrl" ].insert( "validator_type" );	2949	propertiesToRemove[ "wxStyledTextCtrl" ].insert( "validator_type" );
2950	propertiesToRemove[ "wxPropertyGridManager" ].insert( "use_wxAddition" );	2950	propertiesToRemove[ "wxPropertyGridManager" ].insert( "use_wxAddition" );
2951	propertiesToRemove[ "wxPropertyGridManager" ].insert( "validator_style" );	2951	propertiesToRemove[ "wxPropertyGridManager" ].insert( "validator_style" );
2952	propertiesToRemove[ "wxPropertyGridManager" ].insert( "validator_type" );	2952	propertiesToRemove[ "wxPropertyGridManager" ].insert( "validator_type" );
2953		2953
2954	propertiesToRemove[ "wxadditions::wxTreeListCtrl" ].insert( "validator_style" );	2954	propertiesToRemove[ "wxadditions::wxTreeListCtrl" ].insert( "validator_style" );
2955	propertiesToRemove[ "wxadditions::wxTreeListCtrl" ].insert( "validator_type" );	2955	propertiesToRemove[ "wxadditions::wxTreeListCtrl" ].insert( "validator_type" );
2956	}	2956	}
2957	return propertiesToRemove;	2957	return propertiesToRemove;
2958	}	2958	}