From 75ffcbcef5d1f43658fa5fbd51a69e9cedef3d7d Mon Sep 17 00:00:00 2001 From: Diogo Condeco Date: Fri, 27 Jan 2017 20:31:35 +0000 Subject: [PATCH] MACOS Setfocus and CancelButtonIssue moved into dialog_shim. Setfocus now works on macos dialogs by setting DLGSHIM_USE_SETFOCUS. This option is only enabled __WXMAC__ is defined. FixOSXCancelButtonIssue() is now called inside DIALOG_SHIM::SHOW. All other calls from within the dialogs were removed. --- common/dialog_shim.cpp | 3 +++ eeschema/dialogs/dialog_bom.cpp | 2 -- eeschema/dialogs/dialog_edit_component_in_lib.cpp | 3 --- eeschema/dialogs/dialog_edit_component_in_schematic.cpp | 2 -- eeschema/dialogs/dialog_edit_label.cpp | 2 -- eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp | 2 -- eeschema/dialogs/dialog_edit_one_field.cpp | 2 -- eeschema/dialogs/dialog_eeschema_options.cpp | 2 -- eeschema/dialogs/dialog_erc.cpp | 2 -- eeschema/dialogs/dialog_lib_edit_draw_item.cpp | 2 -- eeschema/dialogs/dialog_lib_edit_pin.cpp | 2 -- eeschema/dialogs/dialog_lib_edit_text.cpp | 2 -- eeschema/dialogs/dialog_lib_new_component.cpp | 2 -- eeschema/dialogs/dialog_libedit_options.cpp | 2 -- eeschema/dialogs/dialog_netlist.cpp | 2 -- eeschema/dialogs/dialog_plot_schematic.cpp | 3 --- eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp | 3 --- eeschema/dialogs/dialog_sch_sheet_props.cpp | 2 -- eeschema/dialogs/dialog_signal_list.cpp | 1 - eeschema/dialogs/dialog_sim_settings.cpp | 1 - eeschema/dialogs/dialog_spice_model.cpp | 1 - include/dialog_shim.h | 7 +++++++ pcbnew/dialogs/dialog_design_rules.cpp | 2 -- pcbnew/dialogs/dialog_display_options.cpp | 2 -- pcbnew/dialogs/dialog_drc.cpp | 2 -- pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp | 1 - pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp | 1 - pcbnew/dialogs/dialog_edit_module_text.cpp | 1 - pcbnew/dialogs/dialog_enum_pads.cpp | 2 -- pcbnew/dialogs/dialog_export_idf.cpp | 2 -- pcbnew/dialogs/dialog_export_step.cpp | 2 -- pcbnew/dialogs/dialog_export_vrml.cpp | 2 -- pcbnew/dialogs/dialog_graphic_item_properties.cpp | 1 - pcbnew/dialogs/dialog_graphic_items_options.cpp | 1 - pcbnew/dialogs/dialog_pad_properties.cpp | 2 -- pcbnew/dialogs/dialog_pcb_text_properties.cpp | 1 - pcbnew/dialogs/dialog_select_pretty_lib.cpp | 2 -- pcbnew/dialogs/dialog_set_grid.cpp | 1 - pcbnew/dialogs/dialog_track_via_properties.cpp | 2 -- pcbnew/dialogs/dialog_track_via_size.cpp | 2 -- pcbnew/dimension.cpp | 2 -- pcbnew/target_edit.cpp | 2 -- 42 files changed, 10 insertions(+), 73 deletions(-) diff --git a/common/dialog_shim.cpp b/common/dialog_shim.cpp index a05a5b621c..6db857bdf3 100644 --- a/common/dialog_shim.cpp +++ b/common/dialog_shim.cpp @@ -170,6 +170,9 @@ bool DIALOG_SHIM::Show( bool show ) ret = wxDialog::Show( show ); } + + FixOSXCancelButtonIssue(); + return ret; } diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp index e6c293b00e..4fcc81d154 100644 --- a/eeschema/dialogs/dialog_bom.cpp +++ b/eeschema/dialogs/dialog_bom.cpp @@ -237,8 +237,6 @@ DIALOG_BOM::DIALOG_BOM( SCH_EDIT_FRAME* parent ) : m_checkBoxShowConsole->Show( true ); #endif - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_edit_component_in_lib.cpp b/eeschema/dialogs/dialog_edit_component_in_lib.cpp index 440c8f4830..458dae0417 100644 --- a/eeschema/dialogs/dialog_edit_component_in_lib.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_lib.cpp @@ -49,9 +49,6 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY::DIALOG_EDIT_COMPONENT_IN_LIBRARY( LIB_EDIT_FRA initDlg(); - - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp index 5b18548a55..b93946d8df 100644 --- a/eeschema/dialogs/dialog_edit_component_in_schematic.cpp +++ b/eeschema/dialogs/dialog_edit_component_in_schematic.cpp @@ -220,8 +220,6 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow wxToolTip::Enable( true ); stdDialogButtonSizerOK->SetDefault(); - FixOSXCancelButtonIssue(); - Fit(); } diff --git a/eeschema/dialogs/dialog_edit_label.cpp b/eeschema/dialogs/dialog_edit_label.cpp index 72698766b7..fb6768020f 100644 --- a/eeschema/dialogs/dialog_edit_label.cpp +++ b/eeschema/dialogs/dialog_edit_label.cpp @@ -110,8 +110,6 @@ DIALOG_LABEL_EDITOR::DIALOG_LABEL_EDITOR( SCH_EDIT_FRAME* aParent, SCH_TEXT* aTe m_CurrentText = aTextItem; InitDialog(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp index 8d48950dff..3e3eb9f7f4 100644 --- a/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp +++ b/eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp @@ -205,8 +205,6 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::OnInitDialog( wxInitDialogEvent& event stdDialogButtonSizerOK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_edit_one_field.cpp b/eeschema/dialogs/dialog_edit_one_field.cpp index 9dbd9b7c1b..a02c957366 100644 --- a/eeschema/dialogs/dialog_edit_one_field.cpp +++ b/eeschema/dialogs/dialog_edit_one_field.cpp @@ -142,8 +142,6 @@ void DIALOG_EDIT_ONE_FIELD::init() m_sdbSizerButtonsOK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_eeschema_options.cpp b/eeschema/dialogs/dialog_eeschema_options.cpp index b38eb9538d..77dbceca85 100644 --- a/eeschema/dialogs/dialog_eeschema_options.cpp +++ b/eeschema/dialogs/dialog_eeschema_options.cpp @@ -74,8 +74,6 @@ DIALOG_EESCHEMA_OPTIONS::DIALOG_EESCHEMA_OPTIONS( SCH_EDIT_FRAME* parent ) : Layout(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp index 830d2f753b..dc1f9c068c 100644 --- a/eeschema/dialogs/dialog_erc.cpp +++ b/eeschema/dialogs/dialog_erc.cpp @@ -77,8 +77,6 @@ DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) : m_lastMarkerFound = NULL; Init(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_lib_edit_draw_item.cpp b/eeschema/dialogs/dialog_lib_edit_draw_item.cpp index d0bf3ef0c9..710268a274 100644 --- a/eeschema/dialogs/dialog_lib_edit_draw_item.cpp +++ b/eeschema/dialogs/dialog_lib_edit_draw_item.cpp @@ -38,8 +38,6 @@ DIALOG_LIB_EDIT_DRAW_ITEM::DIALOG_LIB_EDIT_DRAW_ITEM( wxWindow* parent, SetFocus(); m_sdbSizer1OK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_lib_edit_pin.cpp b/eeschema/dialogs/dialog_lib_edit_pin.cpp index d2c1a9a9ac..3da3c90efe 100644 --- a/eeschema/dialogs/dialog_lib_edit_pin.cpp +++ b/eeschema/dialogs/dialog_lib_edit_pin.cpp @@ -66,8 +66,6 @@ void DIALOG_LIB_EDIT_PIN::OnInitDialog( wxInitDialogEvent& event ) { m_textPinName->SetFocus(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_lib_edit_text.cpp b/eeschema/dialogs/dialog_lib_edit_text.cpp index 7e9ee28463..b3a2e9656f 100644 --- a/eeschema/dialogs/dialog_lib_edit_text.cpp +++ b/eeschema/dialogs/dialog_lib_edit_text.cpp @@ -48,8 +48,6 @@ DIALOG_LIB_EDIT_TEXT::DIALOG_LIB_EDIT_TEXT( LIB_EDIT_FRAME* aParent, LIB_TEXT* a m_graphicText = aText; initDlg(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_lib_new_component.cpp b/eeschema/dialogs/dialog_lib_new_component.cpp index 23ddad8ed1..0ac0647aae 100644 --- a/eeschema/dialogs/dialog_lib_new_component.cpp +++ b/eeschema/dialogs/dialog_lib_new_component.cpp @@ -38,8 +38,6 @@ DIALOG_LIB_NEW_COMPONENT::DIALOG_LIB_NEW_COMPONENT( wxWindow* parent ) : // What happens when user presses "Enter"? OK button! OK? m_sdbSizerOK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_libedit_options.cpp b/eeschema/dialogs/dialog_libedit_options.cpp index 4506d772fa..f5ba118d80 100644 --- a/eeschema/dialogs/dialog_libedit_options.cpp +++ b/eeschema/dialogs/dialog_libedit_options.cpp @@ -43,8 +43,6 @@ DIALOG_LIBEDIT_OPTIONS::DIALOG_LIBEDIT_OPTIONS( LIB_EDIT_FRAME* parent ) : SetItemRepeatStep( Parent()->GetRepeatStep() ); SetPinRepeatStep( Parent()->GetRepeatPinStep() ); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_netlist.cpp b/eeschema/dialogs/dialog_netlist.cpp index b697cac68c..d5e71da338 100644 --- a/eeschema/dialogs/dialog_netlist.cpp +++ b/eeschema/dialogs/dialog_netlist.cpp @@ -347,8 +347,6 @@ NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) : SetDefaultItem( m_buttonNetlist ); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp index 39a0c2e98c..5d57f954b1 100644 --- a/eeschema/dialogs/dialog_plot_schematic.cpp +++ b/eeschema/dialogs/dialog_plot_schematic.cpp @@ -75,9 +75,6 @@ DIALOG_PLOT_SCHEMATIC::DIALOG_PLOT_SCHEMATIC( SCH_EDIT_FRAME* parent ) : initDlg(); - - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp b/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp index 27997d846d..09da9b611d 100644 --- a/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp +++ b/eeschema/dialogs/dialog_sch_edit_sheet_pin.cpp @@ -48,9 +48,6 @@ DIALOG_SCH_EDIT_SHEET_PIN::DIALOG_SCH_EDIT_SHEET_PIN( wxWindow* parent ) : m_textName->SetFocus(); m_sdbSizerOK->SetDefault(); - - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); diff --git a/eeschema/dialogs/dialog_sch_sheet_props.cpp b/eeschema/dialogs/dialog_sch_sheet_props.cpp index 795a56af41..140ba45ba4 100644 --- a/eeschema/dialogs/dialog_sch_sheet_props.cpp +++ b/eeschema/dialogs/dialog_sch_sheet_props.cpp @@ -34,8 +34,6 @@ DIALOG_SCH_SHEET_PROPS::DIALOG_SCH_SHEET_PROPS( wxWindow* parent ) : m_textFileName->SetFocus(); m_sdbSizer1OK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/eeschema/dialogs/dialog_signal_list.cpp b/eeschema/dialogs/dialog_signal_list.cpp index fdc96ed1f3..bd2eaaf9b8 100644 --- a/eeschema/dialogs/dialog_signal_list.cpp +++ b/eeschema/dialogs/dialog_signal_list.cpp @@ -31,7 +31,6 @@ DIALOG_SIGNAL_LIST::DIALOG_SIGNAL_LIST( SIM_PLOT_FRAME* aParent, NETLIST_EXPORTE : DIALOG_SIGNAL_LIST_BASE( aParent ), m_plotFrame( aParent ), m_exporter( aExporter ) { - FixOSXCancelButtonIssue(); } diff --git a/eeschema/dialogs/dialog_sim_settings.cpp b/eeschema/dialogs/dialog_sim_settings.cpp index 23a5901c6b..ef00a4fdcb 100644 --- a/eeschema/dialogs/dialog_sim_settings.cpp +++ b/eeschema/dialogs/dialog_sim_settings.cpp @@ -66,7 +66,6 @@ DIALOG_SIM_SETTINGS::DIALOG_SIM_SETTINGS( wxWindow* aParent ) m_sdbSizerOK->SetDefault(); updateNetlistOpts(); - FixOSXCancelButtonIssue(); } diff --git a/eeschema/dialogs/dialog_spice_model.cpp b/eeschema/dialogs/dialog_spice_model.cpp index 830b31fb70..d150a83361 100644 --- a/eeschema/dialogs/dialog_spice_model.cpp +++ b/eeschema/dialogs/dialog_spice_model.cpp @@ -95,7 +95,6 @@ DIALOG_SPICE_MODEL::DIALOG_SPICE_MODEL( wxWindow* aParent, SCH_COMPONENT& aCompo m_sdbSizerOK->SetDefault(); - FixOSXCancelButtonIssue(); } diff --git a/include/dialog_shim.h b/include/dialog_shim.h index eec2094601..4effc36b9e 100644 --- a/include/dialog_shim.h +++ b/include/dialog_shim.h @@ -29,7 +29,14 @@ #include #include +#ifdef __WXMAC__ +/** + * MACOS requires this option to be set to 1 in order to set dialogs focus. + **/ +#define DLGSHIM_USE_SETFOCUS 1 +#else #define DLGSHIM_USE_SETFOCUS 0 +#endif class WDO_ENABLE_DISABLE; class EVENT_LOOP; diff --git a/pcbnew/dialogs/dialog_design_rules.cpp b/pcbnew/dialogs/dialog_design_rules.cpp index 0da920c8d6..536fb599d0 100644 --- a/pcbnew/dialogs/dialog_design_rules.cpp +++ b/pcbnew/dialogs/dialog_design_rules.cpp @@ -211,8 +211,6 @@ DIALOG_DESIGN_RULES::DIALOG_DESIGN_RULES( PCB_EDIT_FRAME* parent ) : Layout(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/pcbnew/dialogs/dialog_display_options.cpp b/pcbnew/dialogs/dialog_display_options.cpp index 95506aa6e1..5f713e7e31 100644 --- a/pcbnew/dialogs/dialog_display_options.cpp +++ b/pcbnew/dialogs/dialog_display_options.cpp @@ -58,8 +58,6 @@ DIALOG_DISPLAY_OPTIONS::DIALOG_DISPLAY_OPTIONS( PCB_EDIT_FRAME* parent ) : init(); m_sdbSizerOK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/pcbnew/dialogs/dialog_drc.cpp b/pcbnew/dialogs/dialog_drc.cpp index 029cf8a166..8ea11582bc 100644 --- a/pcbnew/dialogs/dialog_drc.cpp +++ b/pcbnew/dialogs/dialog_drc.cpp @@ -53,8 +53,6 @@ DIALOG_DRC_CONTROL::DIALOG_DRC_CONTROL( DRC* aTester, PCB_EDIT_FRAME* aEditorFra InitValues(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp index 03a2a3e9ed..90f912c80e 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp @@ -103,7 +103,6 @@ DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent Layout(); - FixOSXCancelButtonIssue(); } diff --git a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp index cd8f6605a5..04727822f3 100644 --- a/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp +++ b/pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp @@ -91,7 +91,6 @@ DIALOG_MODULE_MODULE_EDITOR::DIALOG_MODULE_MODULE_EDITOR( FOOTPRINT_EDIT_FRAME* Layout(); - FixOSXCancelButtonIssue(); } diff --git a/pcbnew/dialogs/dialog_edit_module_text.cpp b/pcbnew/dialogs/dialog_edit_module_text.cpp index ddae8a4d82..e45b997a41 100644 --- a/pcbnew/dialogs/dialog_edit_module_text.cpp +++ b/pcbnew/dialogs/dialog_edit_module_text.cpp @@ -85,7 +85,6 @@ DialogEditModuleText::DialogEditModuleText( PCB_BASE_FRAME* aParent, m_sdbSizerOK->SetDefault(); SetFocus(); - FixOSXCancelButtonIssue(); } diff --git a/pcbnew/dialogs/dialog_enum_pads.cpp b/pcbnew/dialogs/dialog_enum_pads.cpp index b658f65280..ac08f112ff 100644 --- a/pcbnew/dialogs/dialog_enum_pads.cpp +++ b/pcbnew/dialogs/dialog_enum_pads.cpp @@ -28,8 +28,6 @@ DIALOG_ENUM_PADS::DIALOG_ENUM_PADS( wxWindow* aParent ) : DIALOG_ENUM_PADS_BASE( aParent ) { - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/pcbnew/dialogs/dialog_export_idf.cpp b/pcbnew/dialogs/dialog_export_idf.cpp index ffaf684a7e..80c55ef594 100644 --- a/pcbnew/dialogs/dialog_export_idf.cpp +++ b/pcbnew/dialogs/dialog_export_idf.cpp @@ -94,8 +94,6 @@ public: m_sdbSizerOK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/pcbnew/dialogs/dialog_export_step.cpp b/pcbnew/dialogs/dialog_export_step.cpp index 4b56aa58fc..c637990c25 100644 --- a/pcbnew/dialogs/dialog_export_step.cpp +++ b/pcbnew/dialogs/dialog_export_step.cpp @@ -102,8 +102,6 @@ public: m_sdbSizerOK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/pcbnew/dialogs/dialog_export_vrml.cpp b/pcbnew/dialogs/dialog_export_vrml.cpp index 9d64068ea6..8b033c456c 100644 --- a/pcbnew/dialogs/dialog_export_vrml.cpp +++ b/pcbnew/dialogs/dialog_export_vrml.cpp @@ -87,8 +87,6 @@ public: m_VRML_Yref->SetValue( tmpStr ); m_sdbSizer1OK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp index 7928218557..7452df69a4 100644 --- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp +++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp @@ -103,7 +103,6 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES::DIALOG_GRAPHIC_ITEM_PROPERTIES( PCB_EDIT_FRAME* m_StandardButtonsSizerOK->SetDefault(); - FixOSXCancelButtonIssue(); } diff --git a/pcbnew/dialogs/dialog_graphic_items_options.cpp b/pcbnew/dialogs/dialog_graphic_items_options.cpp index c6a3b61cca..6ffdda0c8c 100644 --- a/pcbnew/dialogs/dialog_graphic_items_options.cpp +++ b/pcbnew/dialogs/dialog_graphic_items_options.cpp @@ -63,7 +63,6 @@ DIALOG_GRAPHIC_ITEMS_OPTIONS::DIALOG_GRAPHIC_ITEMS_OPTIONS( PCB_BASE_FRAME* pare m_sdbSizerOK->SetDefault(); - FixOSXCancelButtonIssue(); } DIALOG_GRAPHIC_ITEMS_OPTIONS::~DIALOG_GRAPHIC_ITEMS_OPTIONS() diff --git a/pcbnew/dialogs/dialog_pad_properties.cpp b/pcbnew/dialogs/dialog_pad_properties.cpp index 0189652d0b..2206d9298d 100644 --- a/pcbnew/dialogs/dialog_pad_properties.cpp +++ b/pcbnew/dialogs/dialog_pad_properties.cpp @@ -152,8 +152,6 @@ DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* aParent, D_PAD* aP m_sdbSizerOK->SetDefault(); m_canUpdate = true; - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/pcbnew/dialogs/dialog_pcb_text_properties.cpp b/pcbnew/dialogs/dialog_pcb_text_properties.cpp index 65077725da..958d7b735d 100644 --- a/pcbnew/dialogs/dialog_pcb_text_properties.cpp +++ b/pcbnew/dialogs/dialog_pcb_text_properties.cpp @@ -101,7 +101,6 @@ DIALOG_PCB_TEXT_PROPERTIES::DIALOG_PCB_TEXT_PROPERTIES( PCB_EDIT_FRAME* parent, m_StandardSizerOK->SetDefault(); - FixOSXCancelButtonIssue(); } diff --git a/pcbnew/dialogs/dialog_select_pretty_lib.cpp b/pcbnew/dialogs/dialog_select_pretty_lib.cpp index 6cd1a4c37b..eaaed78c29 100644 --- a/pcbnew/dialogs/dialog_select_pretty_lib.cpp +++ b/pcbnew/dialogs/dialog_select_pretty_lib.cpp @@ -44,8 +44,6 @@ DIALOG_SELECT_PRETTY_LIB::DIALOG_SELECT_PRETTY_LIB( wxWindow* parent, m_sdbSizerOK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/pcbnew/dialogs/dialog_set_grid.cpp b/pcbnew/dialogs/dialog_set_grid.cpp index ec0e5dc14b..21bc280fcb 100644 --- a/pcbnew/dialogs/dialog_set_grid.cpp +++ b/pcbnew/dialogs/dialog_set_grid.cpp @@ -99,7 +99,6 @@ DIALOG_SET_GRID::DIALOG_SET_GRID( PCB_BASE_FRAME* aParent, const wxArrayString& m_TextPosXUnits->SetLabel( GetUnitsLabel( m_parent->m_UserGridUnit ) ); m_TextPosYUnits->SetLabel( GetUnitsLabel( m_parent->m_UserGridUnit ) ); - FixOSXCancelButtonIssue(); } diff --git a/pcbnew/dialogs/dialog_track_via_properties.cpp b/pcbnew/dialogs/dialog_track_via_properties.cpp index 009e2b2784..9394805c47 100644 --- a/pcbnew/dialogs/dialog_track_via_properties.cpp +++ b/pcbnew/dialogs/dialog_track_via_properties.cpp @@ -200,8 +200,6 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen m_StdButtonsOK->SetDefault(); - FixOSXCancelButtonIssue(); - // Pressing ENTER when any of the text input fields is active applies changes Connect( wxEVT_TEXT_ENTER, wxCommandEventHandler( DIALOG_TRACK_VIA_PROPERTIES::onOkClick ), NULL, this ); } diff --git a/pcbnew/dialogs/dialog_track_via_size.cpp b/pcbnew/dialogs/dialog_track_via_size.cpp index 9264d3247e..9c4d1de84d 100644 --- a/pcbnew/dialogs/dialog_track_via_size.cpp +++ b/pcbnew/dialogs/dialog_track_via_size.cpp @@ -45,8 +45,6 @@ DIALOG_TRACK_VIA_SIZE::DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, BOARD_DESIGN_SE m_trackWidthText->SetSelection( -1, -1 ); m_stdButtonsOK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); diff --git a/pcbnew/dimension.cpp b/pcbnew/dimension.cpp index 87255701cd..dabb9dbdd7 100644 --- a/pcbnew/dimension.cpp +++ b/pcbnew/dimension.cpp @@ -153,8 +153,6 @@ DIALOG_DIMENSION_EDITOR::DIALOG_DIMENSION_EDITOR( PCB_EDIT_FRAME* aParent, m_sdbSizerBtsOK->SetDefault(); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); } diff --git a/pcbnew/target_edit.cpp b/pcbnew/target_edit.cpp index 07658036e1..d570ad74aa 100644 --- a/pcbnew/target_edit.cpp +++ b/pcbnew/target_edit.cpp @@ -112,8 +112,6 @@ TARGET_PROPERTIES_DIALOG_EDITOR::TARGET_PROPERTIES_DIALOG_EDITOR( PCB_EDIT_FRAME // OK button on return key. SetDefaultItem( m_sdbSizerButtsOK ); - FixOSXCancelButtonIssue(); - // Now all widgets have the size fixed, call FinishDialogSettings FinishDialogSettings(); }