From ae3a9d05b5ee13d6b4dcdc8206ccefeb0c3da7d9 Mon Sep 17 00:00:00 2001 From: Josue Date: Mon, 3 Jul 2023 12:43:22 -0500 Subject: [PATCH] Remove dialog events --- .../dialog_graphic_item_properties.cpp | 138 ++---------------- .../dialog_graphic_item_properties_base.cpp | 32 ---- .../dialog_graphic_item_properties_base.fbp | 16 -- .../dialog_graphic_item_properties_base.h | 8 - 4 files changed, 15 insertions(+), 179 deletions(-) diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp index 931db18d48..6e6656acc6 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp +++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp @@ -64,18 +64,6 @@ private: void onFilledCheckbox( wxCommandEvent& event ) override; void onLayerSelection( wxCommandEvent& event ) override; - void startCtrlOnTextEnter( wxCommandEvent& event ) override; - void endCtrlOnTextEnter( wxCommandEvent& event ) override; - void startOnTextEnter( wxCommandEvent& event ) override; - void startOnKillFocus( wxFocusEvent& event ) override; - void endOnTextEnter( wxCommandEvent& event ) override; - void endOnKillFocus( wxFocusEvent& event ) override; - - void segmentOnTextEnter( wxCommandEvent& event ) override; - void segmentOnKillFocus( wxFocusEvent& event ) override; - - void rectangleOnTextEnter( wxCommandEvent& event ) override; - void rectangleOnKillFocus( wxFocusEvent& event ) override; bool Validate() override; @@ -242,102 +230,6 @@ void DIALOG_GRAPHIC_ITEM_PROPERTIES::onFilledCheckbox( wxCommandEvent& event ) } } -void DIALOG_GRAPHIC_ITEM_PROPERTIES::startOnTextEnter( wxCommandEvent& event ) -{ - switch( m_item->GetShape() ) - { - case SHAPE_T::SEGMENT: - TransferDataFromWindow(); - TransferDataToWindow(); - break; - case SHAPE_T::RECT: - TransferDataFromWindow(); - TransferDataToWindow(); - break; - default: - break; - } -} - -void DIALOG_GRAPHIC_ITEM_PROPERTIES::startOnKillFocus( wxFocusEvent& event ) -{ - switch( m_item->GetShape() ) - { - case SHAPE_T::SEGMENT: - TransferDataFromWindow(); - TransferDataToWindow(); - break; - case SHAPE_T::RECT: - TransferDataFromWindow(); - TransferDataToWindow(); - break; - default: break; - } - - event.Skip(); -} - -void DIALOG_GRAPHIC_ITEM_PROPERTIES::endOnTextEnter( wxCommandEvent& event ) -{ - switch( m_item->GetShape() ) - { - case SHAPE_T::SEGMENT: - TransferDataFromWindow(); - TransferDataToWindow(); - break; - case SHAPE_T::RECT: - TransferDataFromWindow(); - TransferDataToWindow(); - break; - default: - break; - } -} - -void DIALOG_GRAPHIC_ITEM_PROPERTIES::endOnKillFocus( wxFocusEvent& event ) -{ - switch( m_item->GetShape() ) - { - case SHAPE_T::SEGMENT: - TransferDataFromWindow(); - TransferDataToWindow(); - break; - case SHAPE_T::RECT: - TransferDataFromWindow(); - TransferDataToWindow(); - break; - default: break; - } - - event.Skip(); -} - -void DIALOG_GRAPHIC_ITEM_PROPERTIES::segmentOnTextEnter( wxCommandEvent& event ) -{ - TransferDataFromWindow(); - TransferDataToWindow(); -} - -void DIALOG_GRAPHIC_ITEM_PROPERTIES::segmentOnKillFocus( wxFocusEvent& event ) -{ - TransferDataFromWindow(); - TransferDataToWindow(); - event.Skip(); -} - -void DIALOG_GRAPHIC_ITEM_PROPERTIES::rectangleOnTextEnter( wxCommandEvent& event ) -{ - TransferDataFromWindow(); - TransferDataToWindow(); -} - -void DIALOG_GRAPHIC_ITEM_PROPERTIES::rectangleOnKillFocus( wxFocusEvent& event ) -{ - TransferDataFromWindow(); - TransferDataToWindow(); - event.Skip(); -} - bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataToWindow() { if( !m_item ) @@ -601,22 +493,22 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataFromWindow() if( !( change_begin && change_end ) ) { - rectangle_height = m_rectangleHeight.GetValue(); - rectangle_width = m_rectangleWidth.GetValue(); + rectangle_height = m_rectangleHeight.GetValue(); + rectangle_width = m_rectangleWidth.GetValue(); - if( change_height || change_width ) - { - if( change_end ) - { - m_item->SetStartX( m_item->GetEndX() - rectangle_width ); - m_item->SetStartY( m_item->GetEndY() - rectangle_height ); - } - else - { - m_item->SetEndX( m_item->GetStartX() + rectangle_width ); - m_item->SetEndY( m_item->GetStartY() + rectangle_height ); - } - } + if( change_height || change_width ) + { + if( change_end ) + { + m_item->SetStartX( m_item->GetEndX() - rectangle_width ); + m_item->SetStartY( m_item->GetEndY() - rectangle_height ); + } + else + { + m_item->SetEndX( m_item->GetStartX() + rectangle_width ); + m_item->SetEndY( m_item->GetStartY() + rectangle_height ); + } + } } m_item->SetRectangle( m_rectangleHeight.GetValue(), m_rectangleWidth.GetValue() ); diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp b/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp index aa977b98ac..1580dfe242 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp +++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp @@ -274,22 +274,6 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind // Connect Events this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::OnClose ) ); this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::OnInitDlg ) ); - m_startXCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::startOnKillFocus ), NULL, this ); - m_startXCtrl->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::startOnTextEnter ), NULL, this ); - m_startYCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::startOnKillFocus ), NULL, this ); - m_startYCtrl->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::startOnTextEnter ), NULL, this ); - m_endXCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::endOnKillFocus ), NULL, this ); - m_endXCtrl->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::endOnTextEnter ), NULL, this ); - m_endYCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::endOnKillFocus ), NULL, this ); - m_endYCtrl->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::endOnTextEnter ), NULL, this ); - m_segmentLengthCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::segmentOnKillFocus ), NULL, this ); - m_segmentLengthCtrl->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::segmentOnTextEnter ), NULL, this ); - m_segmentAngleCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::segmentOnKillFocus ), NULL, this ); - m_segmentAngleCtrl->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::segmentOnTextEnter ), NULL, this ); - m_rectangleHeightCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::rectangleOnKillFocus ), NULL, this ); - m_rectangleHeightCtrl->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::rectangleOnTextEnter ), NULL, this ); - m_rectangleWidthCtrl->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::rectangleOnKillFocus ), NULL, this ); - m_rectangleWidthCtrl->Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::rectangleOnTextEnter ), NULL, this ); m_filledCtrl->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::onFilledCheckbox ), NULL, this ); m_LayerSelectionCtrl->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::onLayerSelection ), NULL, this ); } @@ -299,22 +283,6 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::~DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE() // Disconnect Events this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::OnClose ) ); this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::OnInitDlg ) ); - m_startXCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::startOnKillFocus ), NULL, this ); - m_startXCtrl->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::startOnTextEnter ), NULL, this ); - m_startYCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::startOnKillFocus ), NULL, this ); - m_startYCtrl->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::startOnTextEnter ), NULL, this ); - m_endXCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::endOnKillFocus ), NULL, this ); - m_endXCtrl->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::endOnTextEnter ), NULL, this ); - m_endYCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::endOnKillFocus ), NULL, this ); - m_endYCtrl->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::endOnTextEnter ), NULL, this ); - m_segmentLengthCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::segmentOnKillFocus ), NULL, this ); - m_segmentLengthCtrl->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::segmentOnTextEnter ), NULL, this ); - m_segmentAngleCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::segmentOnKillFocus ), NULL, this ); - m_segmentAngleCtrl->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::segmentOnTextEnter ), NULL, this ); - m_rectangleHeightCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::rectangleOnKillFocus ), NULL, this ); - m_rectangleHeightCtrl->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::rectangleOnTextEnter ), NULL, this ); - m_rectangleWidthCtrl->Disconnect( wxEVT_KILL_FOCUS, wxFocusEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::rectangleOnKillFocus ), NULL, this ); - m_rectangleWidthCtrl->Disconnect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::rectangleOnTextEnter ), NULL, this ); m_filledCtrl->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::onFilledCheckbox ), NULL, this ); m_LayerSelectionCtrl->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::onLayerSelection ), NULL, this ); diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp b/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp index 8e44df92e8..059a376198 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp +++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp @@ -284,8 +284,6 @@ - startOnKillFocus - startOnTextEnter @@ -484,8 +482,6 @@ - startOnKillFocus - startOnTextEnter @@ -749,8 +745,6 @@ - endOnKillFocus - endOnTextEnter @@ -949,8 +943,6 @@ - endOnKillFocus - endOnTextEnter @@ -2560,8 +2552,6 @@ - segmentOnKillFocus - segmentOnTextEnter @@ -2757,8 +2747,6 @@ - segmentOnKillFocus - segmentOnTextEnter @@ -2954,8 +2942,6 @@ - rectangleOnKillFocus - rectangleOnTextEnter @@ -3151,8 +3137,6 @@ - rectangleOnKillFocus - rectangleOnTextEnter diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.h b/pcbnew/dialogs/dialog_graphic_item_properties_base.h index 77ca0ed4b8..53f8a1155f 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties_base.h +++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.h @@ -101,14 +101,6 @@ class DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE : public DIALOG_SHIM // Virtual event handlers, override them in your derived class virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } virtual void OnInitDlg( wxInitDialogEvent& event ) { event.Skip(); } - virtual void startOnKillFocus( wxFocusEvent& event ) { event.Skip(); } - virtual void startOnTextEnter( wxCommandEvent& event ) { event.Skip(); } - virtual void endOnKillFocus( wxFocusEvent& event ) { event.Skip(); } - virtual void endOnTextEnter( wxCommandEvent& event ) { event.Skip(); } - virtual void segmentOnKillFocus( wxFocusEvent& event ) { event.Skip(); } - virtual void segmentOnTextEnter( wxCommandEvent& event ) { event.Skip(); } - virtual void rectangleOnKillFocus( wxFocusEvent& event ) { event.Skip(); } - virtual void rectangleOnTextEnter( wxCommandEvent& event ) { event.Skip(); } virtual void onFilledCheckbox( wxCommandEvent& event ) { event.Skip(); } virtual void onLayerSelection( wxCommandEvent& event ) { event.Skip(); }