Commit ca60f086 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Dialog fp plugin option: Fix compil issue under gcc 4.4 (does not happen with... 

Dialog fp plugin option: Fix compil issue under gcc 4.4 (does not happen with 4.6 and later) about an overloaded function.
parent f9cc325b

pcbnew/dialogs/dialog_fp_plugin_options.cpp

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ private: 
        abort();

    }



    void onCancelButtonClick( wxCloseEvent& event )

    void onCancelCaptionButtonClick( wxCloseEvent& event )

    {

        abort();

    }

pcbnew/dialogs/dialog_fp_plugin_options_base.cpp

+3 −3
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Nov  5 2013)

// C++ code generated with wxFormBuilder (version Nov  6 2013)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -130,7 +130,7 @@ DIALOG_FP_PLUGIN_OPTIONS_BASE::DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent, 
	this->Centre( wxBOTH );

	

	// Connect Events

	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onCancelButtonClick ) );

	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onCancelCaptionButtonClick ) );

	m_add_row->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onAppendRow ), NULL, this );

	m_delete_row->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onDeleteRow ), NULL, this );

	m_move_up->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onMoveUp ), NULL, this );
@@ -145,7 +145,7 @@ DIALOG_FP_PLUGIN_OPTIONS_BASE::DIALOG_FP_PLUGIN_OPTIONS_BASE( wxWindow* parent, 
DIALOG_FP_PLUGIN_OPTIONS_BASE::~DIALOG_FP_PLUGIN_OPTIONS_BASE()

{

	// Disconnect Events

	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onCancelButtonClick ) );

	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onCancelCaptionButtonClick ) );

	m_add_row->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onAppendRow ), NULL, this );

	m_delete_row->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onDeleteRow ), NULL, this );

	m_move_up->Disconnect( wxEVT_LEFT_DOWN, wxMouseEventHandler( DIALOG_FP_PLUGIN_OPTIONS_BASE::onMoveUp ), NULL, this );

pcbnew/dialogs/dialog_fp_plugin_options_base.fbp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
            <event name="OnAuiPaneRestore"></event>

            <event name="OnAuiRender"></event>

            <event name="OnChar"></event>

            <event name="OnClose">onCancelButtonClick</event>

            <event name="OnClose">onCancelCaptionButtonClick</event>

            <event name="OnEnterWindow"></event>

            <event name="OnEraseBackground"></event>

            <event name="OnHibernate"></event>

pcbnew/dialogs/dialog_fp_plugin_options_base.h

+2 −2
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Nov  5 2013)

// C++ code generated with wxFormBuilder (version Nov  6 2013)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -53,7 +53,7 @@ class DIALOG_FP_PLUGIN_OPTIONS_BASE : public DIALOG_SHIM 
		wxButton* m_sdbSizer1Cancel;

		

		// Virtual event handlers, overide them in your derived class

		virtual void onCancelButtonClick( wxCloseEvent& event ) = 0;

		virtual void onCancelCaptionButtonClick( wxCloseEvent& event ) = 0;

		virtual void onAppendRow( wxMouseEvent& event ) = 0;

		virtual void onDeleteRow( wxMouseEvent& event ) = 0;

		virtual void onMoveUp( wxMouseEvent& event ) = 0;