X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMMainDescriptionPanel.cpp;h=1b9c970ce4732aa52a8332b8222243bc65a14bdc;hb=refs%2Fheads%2Fvtk7itk4wx3-mingw64;hp=d7f10aed26ef61fd6f3bebf402ecca8a7744247c;hpb=e6d99bba438e086b10239a42492532ff194edb88;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp
index d7f10ae..1b9c970 100644
--- a/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp
+++ b/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp
@@ -73,8 +73,16 @@ bool wxCDMMainDescriptionPanel::Create(
     long style
 )
 {
-  wxPanel::Create(parent, id, pos, size, style);
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+	wxPanel::Create(parent, id, pos, size, style);
+#else
+	wxScrolledWindow::Create(parent, id, pos, size, style);
+#endif
   CreateControls();
+  //to scroll
+  this->FitInside(); // ask the sizer about the needed size
+  this->SetScrollRate(5, 5);
   return TRUE;
 }
 
@@ -97,27 +105,28 @@ void wxCDMMainDescriptionPanel::CreateControls()
   sizer->Add(headerSizer, 0, wxALIGN_CENTER | wxUP, 10);
 
   //Actions
-  wxStaticBoxSizer* actionsBox = new wxStaticBoxSizer(wxVERTICAL, this, wxT("&Actions"));
+  wxStaticBoxSizer* actionsBox = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("&Actions"));
   actionsBox->GetStaticBox()->SetToolTip(wxT("Create a new crea project or open an existing one selection any of the available actions."));
-  wxPanel* actionsPanel = new wxPanel(this);
-  wxBoxSizer* actionsPanelSizer = new wxBoxSizer(wxHORIZONTAL);
+  //wxPanel* actionsPanel = new wxPanel(this);
+  //wxBoxSizer* actionsPanelSizer = new wxBoxSizer(wxHORIZONTAL);
 
-  wxButton* newProjectbt = new wxButton(actionsPanel, ID_BUTTON_NEWPROJECT, _T("New Project"));
+  wxButton* newProjectbt = new wxButton(this, ID_BUTTON_NEWPROJECT, _T("New Project"));
   newProjectbt->SetToolTip(wxT("Create a new crea project."));
-  actionsPanelSizer->Add(newProjectbt, 0, wxRIGHT | wxLEFT, 20);
-  wxButton* openProjectbt = new wxButton(actionsPanel, ID_BUTTON_OPENPROJECT, _T("Open Project (source/binaries)"));
+  actionsBox->Add(newProjectbt, 0, wxALL, 20);
+  wxButton* openProjectbt = new wxButton(this, ID_BUTTON_OPENPROJECT, _T("Open Project (source/binaries)"));
   openProjectbt->SetToolTip(wxT("Open an existing crea project from its binaries or its sources."));
-  actionsPanelSizer->Add(openProjectbt, 0, wxRIGHT | wxLEFT, 20);
+  actionsBox->Add(openProjectbt, 0, wxALL, 20);
 
-  actionsPanel->SetSizer(actionsPanelSizer);
-  actionsPanelSizer->Fit(actionsPanel);
-  actionsBox->Add(actionsPanel, 0, wxALIGN_CENTER | wxALL, 10);
-  sizer -> Add(actionsBox, 0, wxEXPAND | wxALL, 20);
+  //actionsPanel->SetSizer(actionsPanelSizer);
+  //actionsPanelSizer->Fit(actionsPanel);
+
+  //actionsBox->Add(actionsPanel, 0,wxEXPAND | wxALIGN_CENTER | wxALL, 10);
+  sizer -> Add(actionsBox, 0, wxALIGN_CENTER | wxALL, 20);
 
   //Asign sizer
   sizer->SetSizeHints(this);
   SetSizer(sizer);
-
+  sizer->Fit(this);
   if(((wxCDMMainFrame*)this->GetParent())->isHelp())
     {
       wxDialog* helpDialog = new wxCDMMainHelpDialog(this->GetParent(), this, wxID_ANY);