From: eduardo.davila@creatis.insa-lyon.fr <eduardo.davila@creatis.insa-lyon.fr>
Date: Fri, 27 Oct 2023 08:58:17 +0000 (+0200)
Subject: #3394 wxwidgets 3.2 macOS
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f19db1f9b569fa0b965cb79728b153510ad6f92b;p=crea.git

#3394 wxwidgets 3.2 macOS
---

diff --git a/lib/creaDevManagerLib/wxCDMBlackBoxHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMBlackBoxHelpDialog.cpp
index 16f436d..6502b22 100644
--- a/lib/creaDevManagerLib/wxCDMBlackBoxHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMBlackBoxHelpDialog.cpp
@@ -87,8 +87,12 @@ void wxCDMBlackBoxHelpDialog::CreateControls()
   wxBoxSizer* v_sizer1 = new wxBoxSizer(wxVERTICAL);
 
 
-  wxStaticText* title = new wxStaticText(this, wxID_ANY, wxT("Working with BlackBoxes"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);//new wxRichTextCtrl(this,wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxRE_READONLY);
-  v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+  wxStaticText* title = new wxStaticText(this, wxID_ANY, wxT("Working with BlackBoxes"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+//new wxRichTextCtrl(this,wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxRE_READONLY);
+
+//EED 2023-10-23
+//v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+  v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL , 5);
 
   wxStaticText* instruction = new wxStaticText(
       this,
@@ -131,7 +135,9 @@ void wxCDMBlackBoxHelpDialog::CreateControls()
 
   v_sizer1->Add(new wxCheckBox(this, ID_CHECKBOX_DISABLE_HELP, wxT("&Disable help")), 0, wxALIGN_RIGHT | wxRIGHT, 10);
 
-  v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 30);
+//EED 2023-10-23
+//  v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 30);
+  v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM , 30);
 
   SetSizer(v_sizer1);
   //v_sizer1->RecalcSizes();
diff --git a/lib/creaDevManagerLib/wxCDMMainHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMMainHelpDialog.cpp
index 1749dc1..48e90cb 100644
--- a/lib/creaDevManagerLib/wxCDMMainHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainHelpDialog.cpp
@@ -84,8 +84,11 @@ void wxCDMMainHelpDialog::CreateControls()
   wxBoxSizer* v_sizer1 = new wxBoxSizer(wxVERTICAL);
 
 
-  wxStaticText* title = new wxStaticText(this, wxID_ANY, wxT("Welcome to the Crea Development Manager"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);//new wxRichTextCtrl(this,wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxRE_READONLY);
-  v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+  wxStaticText* title = new wxStaticText(this, wxID_ANY, wxT("Welcome to the Crea Development Manager"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+  //new wxRichTextCtrl(this,wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxRE_READONLY);
+  //EED  2023-10-27
+// v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+ v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL , 5);
 
   wxStaticText* instruction = new wxStaticText(
       this,
@@ -117,7 +120,9 @@ void wxCDMMainHelpDialog::CreateControls()
 
   v_sizer1->Add(new wxCheckBox(this, ID_CHECKBOX_DISABLE_HELP, wxT("&Disable help")), 0, wxALIGN_RIGHT | wxRIGHT, 10);
 
-  v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 30);
+//EED  2023-10-27
+//  v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 30);
+  v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM , 30);
 
   SetSizer(v_sizer1);
   //v_sizer1->RecalcSizes();
diff --git a/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp b/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp
index 94dbaa6..b2fe7fd 100644
--- a/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMNewBlackBoxDialog.cpp
@@ -155,10 +155,16 @@ void wxCDMNewBlackBoxDialog::CreateControls()
 
 
   wxStaticText* title = new wxStaticText(this, wxID_ANY, wxT("Create a new black box"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
-  v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+
+//EED 2023-10-27
+//v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+  v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL , 5);
 
   wxStaticText* instruction = new wxStaticText(this, wxID_ANY, wxT("Please fill the following details."), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
-  v_sizer1->Add(instruction, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+    
+//EED 2023-10-27
+//v_sizer1->Add(instruction, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+  v_sizer1->Add(instruction, 0, wxALIGN_LEFT | wxALL , 5);
 
   wxFlexGridSizer* formItems = new wxFlexGridSizer(10,2,9,15);
 
@@ -218,7 +224,9 @@ void wxCDMNewBlackBoxDialog::CreateControls()
   h_sizer2->Add(new wxButton(this, ID_BUTTON_NEXT, wxT("Create Black Box")), 0, wxALL | wxALIGN_CENTER_VERTICAL, 5);
   h_sizer2->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Cancel")), 0, wxALL | wxALIGN_CENTER_VERTICAL, 5);
 
-  v_sizer1->Add(h_sizer2, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 30);
+//EED 2023-10-27
+  //v_sizer1->Add(h_sizer2, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 30);
+  v_sizer1->Add(h_sizer2, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM , 30);
 
   SetSizer(v_sizer1);
 }
diff --git a/lib/creaDevManagerLib/wxCDMPackageHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMPackageHelpDialog.cpp
index 83d7e1d..927d7a2 100644
--- a/lib/creaDevManagerLib/wxCDMPackageHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMPackageHelpDialog.cpp
@@ -86,8 +86,12 @@ void wxCDMPackageHelpDialog::CreateControls()
   wxBoxSizer* v_sizer1 = new wxBoxSizer(wxVERTICAL);
 
 
-  wxStaticText* title = new wxStaticText(this, wxID_ANY, wxT("Working with Packages"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);//new wxRichTextCtrl(this,wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxRE_READONLY);
-  v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+  wxStaticText* title = new wxStaticText(this, wxID_ANY, wxT("Working with Packages"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+//new wxRichTextCtrl(this,wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxRE_READONLY);
+
+// 2023-10-27
+//  v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+  v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL , 5);
 
   wxStaticText* instruction = new wxStaticText(
       this,
@@ -125,7 +129,9 @@ void wxCDMPackageHelpDialog::CreateControls()
 
   v_sizer1->Add(new wxCheckBox(this, ID_CHECKBOX_DISABLE_HELP, wxT("&Disable help")), 0, wxALIGN_RIGHT | wxRIGHT, 10);
 
-  v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 30);
+// 2023-10-27
+// v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 30);
+  v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM , 30);
 
   SetSizer(v_sizer1);
   //v_sizer1->RecalcSizes();
diff --git a/lib/creaDevManagerLib/wxCDMProjectHelpDialog.cpp b/lib/creaDevManagerLib/wxCDMProjectHelpDialog.cpp
index 9a3a0b5..31d4a31 100644
--- a/lib/creaDevManagerLib/wxCDMProjectHelpDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMProjectHelpDialog.cpp
@@ -82,10 +82,12 @@ void wxCDMProjectHelpDialog::CreateControls()
 {
 
   wxBoxSizer* v_sizer1 = new wxBoxSizer(wxVERTICAL);
-
-
-  wxStaticText* title = new wxStaticText(this, wxID_ANY, wxT("Your project is ready!"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);//new wxRichTextCtrl(this,wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxRE_READONLY);
-  v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+  wxStaticText* title = new wxStaticText(this, wxID_ANY, wxT("Your project is ready!"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+//new wxRichTextCtrl(this,wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxRE_READONLY);
+    
+//EED 2023-10-27
+//v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
+  v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL , 5);
 
   wxStaticText* instruction = new wxStaticText(
       this,
@@ -114,7 +116,9 @@ void wxCDMProjectHelpDialog::CreateControls()
 
   v_sizer1->Add(new wxCheckBox(this, ID_CHECKBOX_DISABLE_HELP, wxT("&Disable help")), 0, wxALIGN_RIGHT | wxRIGHT, 10);
 
-  v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 30);
+//EED 2023-10-27
+//v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 30);
+v_sizer1->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Close")), 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM , 30);
 
   SetSizer(v_sizer1);
   //v_sizer1->RecalcSizes();