https://lists.launchpad.net/kicad-developers/msg14286.html

common/kiway_player.cpp

@@ -104,14 +104,7 @@ bool KIWAY_PLAYER::ShowModal( wxString* aResult, wxWindow* aResultantFocusWindow
         // re-enables only those that were disabled on exit
         wxWindowDisabler    toggle( this );
 
-        WX_EVENT_LOOP           event_loop;
-
-#if wxCHECK_VERSION( 2, 9, 4 )  // 2.9.4 is only approximate.
-        // new code needs this, old code does it in wxEventLoop::Run() and cannot
-        // tolerate it here. Where that boundary is as a version number, I don't know.
-        // A closer look at the subversion repo for wx would tell.
-        wxEventLoopActivator    event_loop_stacker( &event_loop );
-#endif
+        WX_EVENT_LOOP          event_loop;
 
         m_modal_loop = &event_loop;
 

eeschema/dialogs/dialog_edit_component_in_schematic.cpp

@@ -148,6 +148,10 @@ void SCH_EDIT_FRAME::EditComponent( SCH_COMPONENT* aComponent )
     // make sure the chipnameTextCtrl is wide enough to hold any unusually long chip names:
     EnsureTextCtrlWidth( dlg->chipnameTextCtrl );
 
+    // This dialog itself subsequently can invoke a KIWAY_PLAYER as a quasimodal
+    // frame. Therefore this dialog as a modal frame parent, MUST be run under
+    // quasimodal mode for the quasimodal frame support to work.  So don't use
+    // the QUASIMODAL macros here.
     dlg->ShowQuasiModal();
 
     m_canvas->SetIgnoreMouseEvents( false );

eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp

@@ -142,6 +142,10 @@ void LIB_EDIT_FRAME::InstallFieldsEditorDialog( wxCommandEvent& event )
 
     DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB dlg( this, GetCurPart() );
 
+    // This dialog itself subsequently can invoke a KIWAY_PLAYER as a quasimodal
+    // frame. Therefore this dialog as a modal frame parent, MUST be run under
+    // quasimodal mode for the quasimodal frame support to work.  So don't use
+    // the QUASIMODAL macros here.
     int abort = dlg.ShowQuasiModal();
 
     if( abort )

include/dialog_shim.h

@@ -35,14 +35,20 @@
  #define DLGSHIM_USE_SETFOCUS      0
 #endif
 
-#if wxCHECK_VERSION( 2, 9, 4 )
- #define WX_EVENT_LOOP      wxGUIEventLoop
+class WDO_ENABLE_DISABLE;
+class EVENT_LOOP;
+
+// These macros are for DIALOG_SHIM only, NOT for KIWAY_PLAYER.  KIWAY_PLAYER
+// has its own support for quasi modal and its platform specific issues are different
+// than for a wxDialog.
+#if wxCHECK_VERSION( 3, 0, 0 )
+ #define SHOWQUASIMODAL     ShowQuasiModal
+ #define ENDQUASIMODAL      EndQuasiModal
 #else
- #define WX_EVENT_LOOP      wxEventLoop
+ #define SHOWQUASIMODAL     ShowModal
+ #define ENDQUASIMODAL      EndModal
 #endif
 
-class WX_EVENT_LOOP;
-
 
 /**
  * Class DIALOG_SHIM
@@ -86,9 +92,9 @@ protected:
     std::string m_hash_key;     // alternate for class_map when classname re-used.
 
     // variables for quasi-modal behavior support, only used by a few derivatives.
-    WX_EVENT_LOOP*  m_qmodal_loop;      // points to nested event_loop, NULL means not qmodal and dismissed
-    bool            m_qmodal_showing;
-
+    EVENT_LOOP*         m_qmodal_loop;      // points to nested event_loop, NULL means not qmodal and dismissed
+    bool                m_qmodal_showing;
+    WDO_ENABLE_DISABLE* m_qmodal_parent_disabler;
 
 #if DLGSHIM_USE_SETFOCUS
 private:

pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp

@@ -182,7 +182,7 @@ void DIALOG_MODULE_BOARD_EDITOR::InitBoardProperties()
 
 void DIALOG_MODULE_BOARD_EDITOR::OnCancelClick( wxCommandEvent& event )
 {
-    EndModal( -1 );
+    ENDQUASIMODAL( -1 );
 }
 
 
@@ -194,7 +194,7 @@ void DIALOG_MODULE_BOARD_EDITOR::GotoModuleEditor( wxCommandEvent& event )
         m_Parent->OnModify();
     }
 
-    EndModal( 2 );
+    ENDQUASIMODAL( 2 );
 }
 
 
@@ -204,7 +204,7 @@ void DIALOG_MODULE_BOARD_EDITOR::ExchangeModule( wxCommandEvent& event )
 
     // Warning: m_CurrentModule was deleted by exchange module
     m_Parent->SetCurItem( NULL );
-    EndModal( 0 );
+    ENDQUASIMODAL( 0 );
 }
 
 
@@ -241,8 +241,6 @@ void DIALOG_MODULE_BOARD_EDITOR::ModuleOrientEvent( wxCommandEvent& event )
 
 void DIALOG_MODULE_BOARD_EDITOR::InitModeditProperties()
 {
-    SetFocus();
-
     wxString default_path;
     wxGetEnv( wxT( KISYS3DMOD ), &default_path );
 #ifdef __WINDOWS__
@@ -675,7 +673,7 @@ void DIALOG_MODULE_BOARD_EDITOR::OnOkClick( wxCommandEvent& event )
 
     m_Parent->OnModify();
 
-    EndModal( 1 );
+    ENDQUASIMODAL( 1 );
 
     if( m_DC )
     {

pcbnew/editmod.cpp

@@ -59,12 +59,12 @@ void PCB_EDIT_FRAME::InstallModuleOptionsFrame( MODULE* Module, wxDC* DC )
     DIALOG_MODULE_BOARD_EDITOR* dialog = new DIALOG_MODULE_BOARD_EDITOR( this, Module, NULL );
 #endif
 
-    int retvalue = dialog->ShowModal(); /* retvalue =
-                                         *  -1 if abort,
-                                         *  0 if exchange module,
-                                         *  1 for normal edition
-                                         *  and 2 for a goto editor command
-                                         */
+    int retvalue = dialog->SHOWQUASIMODAL();    /* retvalue =
+                                                 *  -1 if abort,
+                                                 *  0 if exchange module,
+                                                 *  1 for normal edition
+                                                 *  and 2 for a goto editor command
+                                                 */
     dialog->Destroy();
 
 #ifdef __WXMAC__