Merge remote-tracking branch 'origin/changeWx28to30' into vtk7itk4wx3

[creaImageIO.git] / src / creaImageIOWxDescriptorPanel.cpp

diff --git a/src/creaImageIOWxDescriptorPanel.cpp b/src/creaImageIOWxDescriptorPanel.cpp
index 60868d45ab7e65817e5c4eb73161c799c99b4fd3..9f563b66493cee26f216d0f00ff303d4dbb75781 100644 (file)
--- a/src/creaImageIOWxDescriptorPanel.cpp
+++ b/src/creaImageIOWxDescriptorPanel.cpp
@@ -109,7 +109,14 @@ namespace creaImageIO
 
        // RESULT
 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
        ResultCtrl=new wxTextCtrl(this, ID_EL_CTRL,_T(""), wxPoint(5,150), wxSize(250,310), wxTE_READONLY| wxMac | wxTE_MULTILINE | wxTE_RICH );
+#else
+       ResultCtrl=new wxTextCtrl(this, ID_EL_CTRL,_T(""), wxPoint(5,150), wxSize(250,310), wxTE_READONLY| wxTE_MULTILINE | wxTE_RICH );
+#endif
+
+
        wxButton *RemoveCtrl = new wxButton(this, ID_REMOVE_ADD,_T("Remove an entry"), wxPoint(280,200) );
        Connect( RemoveCtrl->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxDescriptorPanel::OnRemove ); 
 
@@ -588,7 +595,12 @@ namespace creaImageIO
   //////////////////////////////////////////////////
    void WxDescriptorPanel::OnLoad(wxCommandEvent &Event)
    {
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
            long style = wxOPEN | wxFILE_MUST_EXIST;
+#else
+           long style = wxFD_OPEN | wxFD_FILE_MUST_EXIST;
+#endif
           LevelCtrl->SetValue(_T("patient"));
           ResultCtrl->Clear();
           DscpTree.clear();
@@ -635,7 +647,12 @@ namespace creaImageIO
    const std::string WxDescriptorPanel::saveDescriptor()
    {
           std::string file = "";
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
                long style = wxSAVE;
+#else
+               long style = wxFD_SAVE;
+#endif
                std::string wc("*.dscp");
                wxFileDialog* FD = new wxFileDialog( 0, 
                                                _T("Select file"),