Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,22 @@ endif()
elseif(TARGET wxmono)
target_link_libraries(csv_explorer PRIVATE wxmono)
elseif(TARGET wx::wxcore AND TARGET wx::wxbase)
target_link_libraries(csv_explorer PRIVATE wx::wxcore wx::wxbase)
set(_wx_widgets_targets wx::wxbase wx::wxcore)
if(TARGET wx::wxadv)
list(APPEND _wx_widgets_targets wx::wxadv)
endif()
if(TARGET wx::wxaui)
list(APPEND _wx_widgets_targets wx::wxaui)
endif()
target_link_libraries(csv_explorer PRIVATE ${_wx_widgets_targets})
elseif(TARGET wx::core AND TARGET wx::base)
set(_wx_widgets_targets wx::base wx::core)
if(TARGET wx::adv)
list(APPEND _wx_widgets_targets wx::adv)
endif()
if(TARGET wx::aui)
list(APPEND _wx_widgets_targets wx::aui)
endif()
if(TARGET wxWidgets::wxWidgets)
target_link_libraries(csv_explorer PRIVATE wxWidgets::wxWidgets)
else()
Expand All @@ -149,7 +159,7 @@ endif()
endif()
endif()
else()
find_package(wxWidgets REQUIRED COMPONENTS core base adv)
find_package(wxWidgets REQUIRED COMPONENTS core base adv aui)
include(${wxWidgets_USE_FILE})
target_link_libraries(csv_explorer PRIVATE ${wxWidgets_LIBRARIES})
endif()
Expand Down
18 changes: 9 additions & 9 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ class CsvExplorerApp : public wxApp {
public:
bool OnInit() override {
wxInitAllImageHandlers();
SetExitOnFrameDelete(false);

wxString initialFile;
if (argc > 1) {
initialFile = wxString(argv[1]);
}

auto* frame = CreateMainFrame(initialFile);
auto* frame = CreateMainFrame(argc > 1 ? wxString(argv[1]) : wxString());
SetTopWindow(frame);
frame->Show();

for (int i = 2; i < argc; ++i) {
OpenFileInMainFrame(wxDynamicCast(wxGetActiveWindow(), wxFrame), wxString(argv[i]));
}

return true;
}

#ifdef __WXOSX__
void MacOpenFile(const wxString& fileName) override {
wxFrame* frame = wxDynamicCast(GetTopWindow(), wxFrame);
wxFrame* frame = wxDynamicCast(wxGetActiveWindow(), wxFrame);
if (!frame) {
return;
frame = wxDynamicCast(GetTopWindow(), wxFrame);
}

OpenFileInMainFrame(frame, fileName);
}
#endif
Expand Down
Loading
Loading