From bd1d3e715ef706b562ad87d08d8adb927824c32b Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Tue, 31 Oct 2023 12:50:48 +0100 Subject: [PATCH] #3257 wxwidgets 3.2 macOS --- .../wxDiagramPropertiesEditionDialog.cxx | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx index f97d81c..800ab3c 100755 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxDiagramPropertiesEditionDialog.cxx @@ -100,22 +100,22 @@ namespace bbtk void wxDiagramPropertiesEditionDialog::constructDiagramPropertiesEditionDialog() { - const int ID_COMBO = 1; - wxPanel *panel = new wxPanel(this, -1); - wxBoxSizer *hbox = new wxBoxSizer(wxHORIZONTAL); - wxFlexGridSizer *fgsizer = new wxFlexGridSizer(8, 2, 9, 25); + const int ID_COMBO = 1; + wxPanel *panel = new wxPanel(this, -1); + wxBoxSizer *hbox = new wxBoxSizer(wxHORIZONTAL); + wxFlexGridSizer *fgsizer = new wxFlexGridSizer(8, 2, 9, 25); - - //CFT - - wxStaticText *tree = new wxStaticText(panel, -1, wxT("Tree of Box")); + //CFT + wxStaticText *tree = new wxStaticText(panel, -1, wxT("Tree of Box")); - string sp = _tree.data; - const char* cc = sp.c_str(); - wxString p = wxString::FromUTF8 (cc); - - _treeBox = new wxTreeCtrl (this, wxID_ANY, wxPoint(0,0), wxSize(320,300), wxTR_HAS_BUTTONS | wxTR_SINGLE ); - wxTreeItemId itemId = _treeBox->AddRoot(p, -1,-1,NULL); + string sp = _tree.data; + const char* cc = sp.c_str(); + wxString p = wxString::FromUTF8 (cc); + +//EED 2023-10-31 +// _treeBox = new wxTreeCtrl (this, wxID_ANY, wxPoint(0,0), wxSize(320,300), wxTR_HAS_BUTTONS | wxTR_SINGLE ); + _treeBox = new wxTreeCtrl (panel, wxID_ANY, wxPoint(0,0), wxSize(320,300), wxTR_HAS_BUTTONS | wxTR_SINGLE ); + wxTreeItemId itemId = _treeBox->AddRoot(p, -1,-1,NULL); constructBoxTree(_tree, itemId); _treeBox->ExpandAll(); @@ -246,18 +246,18 @@ wx if (currentLevelStr == "9" ) { currentLevel = 10;} _diagramMessageLevel->Select(currentLevel); - wxStaticText *type = new wxStaticText(panel, -1, wxT("Type")); - wxStaticText *author = new wxStaticText(panel, -1, wxT("Author")); - wxStaticText *category = new wxStaticText(panel, -1, wxT("Categories")); - wxStaticText *description = new wxStaticText(panel, -1, wxT("Description")); - wxStaticText *messageKind = new wxStaticText(panel, -1, wxT("Message kind")); - wxStaticText *messageLevel = new wxStaticText(panel, -1, wxT("Message level")); + wxStaticText *type = new wxStaticText(panel, -1, wxT("Type")); + wxStaticText *author = new wxStaticText(panel, -1, wxT("Author")); + wxStaticText *category = new wxStaticText(panel, -1, wxT("Categories")); + wxStaticText *description = new wxStaticText(panel, -1, wxT("Description")); + wxStaticText *messageKind = new wxStaticText(panel, -1, wxT("Message kind")); + wxStaticText *messageLevel = new wxStaticText(panel, -1, wxT("Message level")); - _txtAuthor = new wxTextCtrl(panel, -1); - _txtCategory = new wxTextCtrl(panel, -1); - _txtDescription = new wxTextCtrl(panel, -1, wxT(""), wxPoint(-1, -1), wxSize(-1, -1), wxTE_MULTILINE); - wxButton *okButton = new wxButton(panel, -1, _T("Ok"),wxDefaultPosition, wxSize(-1, -1)); - wxButton *closeButton = new wxButton(panel, -1, _T("Close"), wxDefaultPosition, wxSize(-1, -1)); + _txtAuthor = new wxTextCtrl(panel, -1); + _txtCategory = new wxTextCtrl(panel, -1); + _txtDescription = new wxTextCtrl(panel, -1, wxT(""), wxPoint(-1, -1), wxSize(-1, -1), wxTE_MULTILINE); + wxButton *okButton = new wxButton(panel, -1, _T("Ok"),wxDefaultPosition, wxSize(-1, -1)); + wxButton *closeButton = new wxButton(panel, -1, _T("Close"), wxDefaultPosition, wxSize(-1, -1)); // connect command event handlers Connect(okButton->GetId(),wxEVT_COMMAND_BUTTON_CLICKED,wxCommandEventHandler(wxDiagramPropertiesEditionDialog::onClickOk)); @@ -268,7 +268,6 @@ wx _txtCategory->SetValue(crea::std2wx(_parent->getCurrentDiagramCategory())); _txtDescription->SetValue(crea::std2wx(_parent->getCurrentDiagramDescription())); - fgsizer->Add(type); fgsizer->Add(_diagramType, 1, wxEXPAND); fgsizer->Add(author); -- 2.45.0