#3385 vtk9itk5wx3-macos

diff --git a/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx b/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx
index a205f95..6746cf2 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxConceptControl.cxx
@@ -38,8 +38,10 @@
 // Generated events declaration and definition
 //------------------------------------------------------------------------------------------------------------
 
+//EED 2022-09-30
+//DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
+wxDEFINE_EVENT(wxEVT_CONCEPT_RELEASE, wxCommandEvent);
 
-DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
 
        //------------------------------------------------------------------------------------------------------------
        // Constructors & Destructors

diff --git a/lib/Interface_ManagerContour_NDimensions/wxConceptControl.h b/lib/Interface_ManagerContour_NDimensions/wxConceptControl.h
index 821cb37..e2df74c 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxConceptControl.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxConceptControl.h
@@ -50,9 +50,13 @@
 //------------------------------------------------------------------------------------------------------------
 // Events declaration
 //------------------------------------------------------------------------------------------------------------
+/*EED 2022-09-30
 BEGIN_DECLARE_EVENT_TYPES()
        DECLARE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE, -1 ) 
 END_DECLARE_EVENT_TYPES()
+*/
+wxDECLARE_EVENT(wxEVT_CONCEPT_RELEASE, wxCommandEvent);
+
 
 /** file wxConceptControl.h */
 

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.h b/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.h
index f31cc13..4647214 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_ButtonsBar.h
@@ -47,12 +47,6 @@
 //------------------------------------------------------------------------------------------------------------
 #include <wx/event.h>
 
-//------------------------------------------------------------------------------------------------------------
-// Events declaration
-//------------------------------------------------------------------------------------------------------------
-/*BEGIN_DECLARE_EVENT_TYPES()
-       DECLARE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE, -1 ) 
-END_DECLARE_EVENT_TYPES()*/
 
 /** file wxContour_ButtonsBar.h */
 

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_ControlPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContour_ControlPanel.cxx
index 38ebf0e..28b9e4a 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_ControlPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_ControlPanel.cxx
@@ -45,9 +45,6 @@
 // Generated events declaration and definition
 //------------------------------------------------------------------------------------------------------------
 
-//DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
-
-
        //------------------------------------------------------------------------------------------------------------
        // Constructors & Destructors
        //------------------------------------------------------------------------------------------------------------

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_ControlPanel.h b/lib/Interface_ManagerContour_NDimensions/wxContour_ControlPanel.h
index 4d8f000..86fd2db 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_ControlPanel.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_ControlPanel.h
@@ -46,15 +46,6 @@
 //------------------------------------------------------------------------------------------------------------
 
 
-//------------------------------------------------------------------------------------------------------------
-// Events declaration
-//------------------------------------------------------------------------------------------------------------
-/*BEGIN_DECLARE_EVENT_TYPES()
-       DECLARE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE, -1 ) 
-END_DECLARE_EVENT_TYPES()*/
-
-/** file wxContour_ControlPanel.h */
-
 class wxContour_ListViewPanel;
 //------------------------------------------------------------------------------------------------------------
 // Class definition

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_Grid.cxx b/lib/Interface_ManagerContour_NDimensions/wxContour_Grid.cxx
index 3031e70..2fde1a7 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_Grid.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_Grid.cxx
@@ -43,9 +43,6 @@
 // Generated events declaration and definition
 //------------------------------------------------------------------------------------------------------------
 
-//DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
-
-
        //------------------------------------------------------------------------------------------------------------
        // Constructors & Destructors
        //------------------------------------------------------------------------------------------------------------

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_Grid.h b/lib/Interface_ManagerContour_NDimensions/wxContour_Grid.h
index c5b094a..1160b5a 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_Grid.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_Grid.h
@@ -49,11 +49,6 @@
 //------------------------------------------------------------------------------------------------------------
 // Events declaration
 //------------------------------------------------------------------------------------------------------------
-/*BEGIN_DECLARE_EVENT_TYPES()
-       DECLARE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE, -1 ) 
-END_DECLARE_EVENT_TYPES()*/
-
-/** file wxContour_Grid.h */
 
 
 //------------------------------------------------------------------------------------------------------------

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.cxx b/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.cxx
index 1c8d8ee..a8203e9 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.cxx
@@ -43,9 +43,6 @@
 // Generated events declaration and definition
 //------------------------------------------------------------------------------------------------------------
 
-//DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
-
-
        //------------------------------------------------------------------------------------------------------------
        // Constructors & Destructors
        //------------------------------------------------------------------------------------------------------------

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.h b/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.h
index 9dfb016..b43d590 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_MenuBar.h
@@ -49,12 +49,6 @@
 //------------------------------------------------------------------------------------------------------------
 // Events declaration
 //------------------------------------------------------------------------------------------------------------
-/*BEGIN_DECLARE_EVENT_TYPES()
-       DECLARE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE, -1 ) 
-END_DECLARE_EVENT_TYPES()*/
-
-/** file wxContour_MenuBar.h */
-
 
 //------------------------------------------------------------------------------------------------------------
 // Class definition

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_OperationsToolsPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContour_OperationsToolsPanel.cxx
index 1047fcd..2cbce69 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_OperationsToolsPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_OperationsToolsPanel.cxx
@@ -43,8 +43,6 @@
 // Generated events declaration and definition
 //------------------------------------------------------------------------------------------------------------
 
-//DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
-
 
        //------------------------------------------------------------------------------------------------------------
        // Constructors & Destructors

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_OperationsToolsPanel.h b/lib/Interface_ManagerContour_NDimensions/wxContour_OperationsToolsPanel.h
index 7f81bb1..b23bee7 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_OperationsToolsPanel.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_OperationsToolsPanel.h
@@ -46,16 +46,6 @@
 //------------------------------------------------------------------------------------------------------------
 
 
-//------------------------------------------------------------------------------------------------------------
-// Events declaration
-//------------------------------------------------------------------------------------------------------------
-/*BEGIN_DECLARE_EVENT_TYPES()
-       DECLARE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE, -1 ) 
-END_DECLARE_EVENT_TYPES()*/
-
-/** file wxContour_OperationsToolsPanel.h */
-
-
 //------------------------------------------------------------------------------------------------------------
 // Class definition
 //------------------------------------------------------------------------------------------------------------

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_StandardToolsPanel.cxx b/lib/Interface_ManagerContour_NDimensions/wxContour_StandardToolsPanel.cxx
index 9bb3206..b5bab92 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_StandardToolsPanel.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_StandardToolsPanel.cxx
@@ -43,8 +43,6 @@
 // Generated events declaration and definition
 //------------------------------------------------------------------------------------------------------------
 
-//DEFINE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE )
-
 
        //------------------------------------------------------------------------------------------------------------
        // Constructors & Destructors

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContour_StandardToolsPanel.h b/lib/Interface_ManagerContour_NDimensions/wxContour_StandardToolsPanel.h
index 06ac6b1..5730cc9 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContour_StandardToolsPanel.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContour_StandardToolsPanel.h
@@ -46,16 +46,6 @@
 //------------------------------------------------------------------------------------------------------------
 
 
-//------------------------------------------------------------------------------------------------------------
-// Events declaration
-//------------------------------------------------------------------------------------------------------------
-/*BEGIN_DECLARE_EVENT_TYPES()
-       DECLARE_EVENT_TYPE( wxEVT_CONCEPT_RELEASE, -1 ) 
-END_DECLARE_EVENT_TYPES()*/
-
-/** file wxContour_StandardToolsPanel.h */
-
-
 //------------------------------------------------------------------------------------------------------------
 // Class definition
 //------------------------------------------------------------------------------------------------------------

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
index 78b568a..1f6a2cf 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.cxx
@@ -45,6 +45,7 @@
 // Generated events declaration and definition
 //------------------------------------------------------------------------------------------------------------
 
+/* EED 2022-09-30 
 DEFINE_EVENT_TYPE( wxEVT_START_CREATE_MULT_ROI )       
 DEFINE_EVENT_TYPE( wxEVT_STOP_CREATE_MULT_ROI )        
 DEFINE_EVENT_TYPE( wxEVT_START_CREATE_ROI )
@@ -61,6 +62,23 @@ DEFINE_EVENT_TYPE( wxEVT_MOVING_ROI_POINT )
 DEFINE_EVENT_TYPE( wxEVT_SELECTED_ROI_POINT )  
 DEFINE_EVENT_TYPE( wxEVT_UNSELECTED_ROI_POINT )        
 DEFINE_EVENT_TYPE( wxEVT_CHANGED_DEEP )        
+*/
+wxDEFINE_EVENT(wxEVT_START_CREATE_MULT_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_STOP_CREATE_MULT_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_START_CREATE_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_STOP_CREATE_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_DELETE_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_SELECTED_MULT_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_SELECTED_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_UNSLECTED_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_MANUAL_HIDED_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_MANUAL_SHOWED_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_EDITING_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_MOVING_ROI, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_MOVING_ROI_POINT, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_SELECTED_ROI_POINT, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_UNSELECTED_ROI_POINT, wxCommandEvent);
+wxDEFINE_EVENT(wxEVT_CHANGED_DEEP, wxCommandEvent);
 
 
        wxVtkBaseView_SceneManager :: wxVtkBaseView_SceneManager( wxVtkBaseView * theWxBaseViewToManage, wxEvtHandler * theEventHandler, double * spc )

diff --git a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h
index c1591b9..de1f2a0 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxVtkBaseView_SceneManager.h
@@ -65,6 +65,7 @@
 //------------------------------------------------------------------------------------------------------------
 // Events declaration
 //------------------------------------------------------------------------------------------------------------
+/* EED 2022-09-30 
 BEGIN_DECLARE_EVENT_TYPES()
        DECLARE_EVENT_TYPE( wxEVT_START_CREATE_MULT_ROI, -1 )   
        DECLARE_EVENT_TYPE( wxEVT_STOP_CREATE_MULT_ROI, -1 )    
@@ -83,6 +84,23 @@ BEGIN_DECLARE_EVENT_TYPES()
        DECLARE_EVENT_TYPE( wxEVT_UNSELECTED_ROI_POINT, -1 )                    
        DECLARE_EVENT_TYPE( wxEVT_CHANGED_DEEP, -1 )
 END_DECLARE_EVENT_TYPES()
+*/
+wxDECLARE_EVENT(wxEVT_START_CREATE_MULT_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_STOP_CREATE_MULT_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_SELECTED_MULT_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_START_CREATE_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_STOP_CREATE_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_DELETE_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_SELECTED_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_UNSLECTED_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_MANUAL_HIDED_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_MANUAL_SHOWED_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_EDITING_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_MOVING_ROI, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_MOVING_ROI_POINT, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_SELECTED_ROI_POINT, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_UNSELECTED_ROI_POINT, wxCommandEvent);
+wxDECLARE_EVENT(wxEVT_CHANGED_DEEP, wxCommandEvent);
 
 /** file wxVtkBaseView_SceneManager.h */