diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp index 67147ed33..8b5aa538c 100644 --- a/src/PrusaSlicer.cpp +++ b/src/PrusaSlicer.cpp @@ -154,7 +154,6 @@ int CLI::run(int argc, char **argv) // Read input file(s) if any. #if ENABLE_GCODE_VIEWER -#if ENABLE_GCODE_DRAG_AND_DROP_GCODE_FILES for (const std::string& file : m_input_files) { std::string ext = boost::filesystem::path(file).extension().string(); if (boost::filesystem::path(file).extension().string() == ".gcode") { @@ -164,7 +163,6 @@ int CLI::run(int argc, char **argv) } } } -#endif // ENABLE_GCODE_DRAG_AND_DROP_GCODE_FILES if (!start_as_gcodeviewer) { #endif // ENABLE_GCODE_VIEWER for (const std::string& file : m_input_files) { diff --git a/src/libslic3r/Technologies.hpp b/src/libslic3r/Technologies.hpp index 0ea666c92..c8e8f421d 100644 --- a/src/libslic3r/Technologies.hpp +++ b/src/libslic3r/Technologies.hpp @@ -55,6 +55,5 @@ #define ENABLE_GCODE_VIEWER (1 && ENABLE_2_3_0_ALPHA1) #define ENABLE_GCODE_VIEWER_STATISTICS (0 && ENABLE_GCODE_VIEWER) #define ENABLE_GCODE_VIEWER_DATA_CHECKING (0 && ENABLE_GCODE_VIEWER) -#define ENABLE_GCODE_DRAG_AND_DROP_GCODE_FILES (1 && ENABLE_GCODE_VIEWER) #endif // _prusaslicer_technologies_h_ diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 1aaf0e713..c16aa3bf6 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -113,7 +113,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S // Load the icon either from the exe, or from the ico file. #if _WIN32 { -#if ENABLE_GCODE_DRAG_AND_DROP_GCODE_FILES +#if ENABLE_GCODE_VIEWER wxString src_path; wxFileName::SplitPath(wxStandardPaths::Get().GetExecutablePath(), &src_path, nullptr, nullptr, wxPATH_NATIVE); switch (wxGetApp().get_app_mode()) { @@ -128,7 +128,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S TCHAR szExeFileName[MAX_PATH]; GetModuleFileName(nullptr, szExeFileName, MAX_PATH); SetIcon(wxIcon(szExeFileName, wxBITMAP_TYPE_ICO)); -#endif // ENABLE_GCODE_DRAG_AND_DROP_GCODE_FILES +#endif // ENABLE_GCODE_VIEWER } #else #if ENABLE_GCODE_VIEWER