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

@@ -170,6 +170,9 @@ bool DIALOG_SHIM::Show( bool show )
 
         ret = wxDialog::Show( show );
     }
+
+    FixOSXCancelButtonIssue();
+
     return ret;
 }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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();
 

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

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

eeschema/dialogs/dialog_sim_settings.cpp

@@ -66,7 +66,6 @@ DIALOG_SIM_SETTINGS::DIALOG_SIM_SETTINGS( wxWindow* aParent )
     m_sdbSizerOK->SetDefault();
     updateNetlistOpts();
 
-    FixOSXCancelButtonIssue();
 }
 
 

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

include/dialog_shim.h

@@ -29,7 +29,14 @@
 #include <hashtables.h>
 #include <kiway_player.h>
 
+#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;

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

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

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

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

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

pcbnew/dialogs/dialog_edit_module_text.cpp

@@ -85,7 +85,6 @@ DialogEditModuleText::DialogEditModuleText( PCB_BASE_FRAME* aParent,
     m_sdbSizerOK->SetDefault();
     SetFocus();
 
-    FixOSXCancelButtonIssue();
 }
 
 

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

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

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

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();
 

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

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()

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

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

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

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

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

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();
 

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

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