From bf8c3e7653b4a137b4ce47623a20fc1c562b2f8e Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Tue, 2 Jan 2024 09:05:02 +0100
Subject: [PATCH] Fixed OSX build and some of warnings

---
 src/slic3r/GUI/MainFrame.cpp            | 2 +-
 src/slic3r/GUI/TopBar.cpp               | 8 ++++----
 src/slic3r/GUI/TopBar.hpp               | 3 ---
 src/slic3r/GUI/UnsavedChangesDialog.cpp | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 8aa32177d3..fc6630bf41 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -1516,7 +1516,7 @@ void MainFrame::init_menubar_as_editor()
 
         editMenu->AppendSeparator();
         append_menu_item(editMenu, wxID_ANY, _L("Searc&h") + "\tCtrl+F",
-            _L("Search in settings"), [this](wxCommandEvent&) { wxGetApp().show_search_dialog(); },
+            _L("Search in settings"), [](wxCommandEvent&) { wxGetApp().show_search_dialog(); },
             "search", nullptr, []() {return true; }, this);
     }
 
diff --git a/src/slic3r/GUI/TopBar.cpp b/src/slic3r/GUI/TopBar.cpp
index 920c38e1bd..2a9e3bdd03 100644
--- a/src/slic3r/GUI/TopBar.cpp
+++ b/src/slic3r/GUI/TopBar.cpp
@@ -77,7 +77,7 @@ void TopBarItemsCtrl::Button::set_hovered(bool hovered)
 #ifdef _WIN32
     this->GetParent()->Refresh(); // force redraw a background of the selected mode button
 #else
-    SetForegroundColour(wxSystemSettings::GetColour(set_focus ? wxSYS_COLOUR_BTNTEXT :
+    SetForegroundColour(wxSystemSettings::GetColour(hovered ? wxSYS_COLOUR_BTNTEXT :
 #if defined (__linux__) && defined (__WXGTK3__)
         wxSYS_COLOUR_GRAYTEXT
 #elif defined (__linux__) && defined (__WXGTK2__)
@@ -136,7 +136,7 @@ void TopBarItemsCtrl::ApplyWorkspacesMenu()
                                                   Slic3r::ConfigOptionMode::comExpert }) {
         const wxString label = get_workspace_name(mode);
         append_menu_item(&m_workspaces_menu, wxID_ANY, label, label,
-            [this, mode](wxCommandEvent&) {
+            [mode](wxCommandEvent&) {
                 if (wxGetApp().get_mode() != mode)
                     wxGetApp().save_mode(mode);
             }, get_bmp_bundle("mode", 16, -1, wxGetApp().get_mode_btn_color(mode)));
@@ -157,11 +157,11 @@ void TopBarItemsCtrl::CreateAuthMenu()
     m_auth_menu.AppendSeparator();
 
     m_connect_dummy_menu_item = append_menu_item(&m_auth_menu, wxID_ANY, _L("PrusaConnect Printers"), "",
-        [this](wxCommandEvent&) { wxGetApp().plater()->get_user_account()->enqueue_connect_printers_action(); }, 
+        [](wxCommandEvent&) { wxGetApp().plater()->get_user_account()->enqueue_connect_printers_action(); }, 
         "", nullptr, []() { return wxGetApp().plater()->get_user_account()->is_logged(); }, this->GetParent());
 
     m_login_menu_item = append_menu_item(&m_auth_menu, wxID_ANY, "", "",
-        [this](wxCommandEvent&) {
+        [](wxCommandEvent&) {
             auto user_account = wxGetApp().plater()->get_user_account();
             if (user_account->is_logged())
                 user_account->do_logout(wxGetApp().app_config);
diff --git a/src/slic3r/GUI/TopBar.hpp b/src/slic3r/GUI/TopBar.hpp
index f67f3db08a..9dd6754605 100644
--- a/src/slic3r/GUI/TopBar.hpp
+++ b/src/slic3r/GUI/TopBar.hpp
@@ -84,7 +84,6 @@ public:
     wxWindow* GetSearchCtrl() { return m_search->GetTextCtrl(); }
 
 private:
-    wxWindow*                       m_parent;
     wxFlexGridSizer*                m_buttons_sizer;
     wxFlexGridSizer*                m_sizer;
     ButtonWithPopup*                m_menu_btn {nullptr};
@@ -474,8 +473,6 @@ private:
     unsigned m_showTimeout,
              m_hideTimeout;
 
-    TopBarItemsCtrl* m_ctrl{ nullptr };
-
 };
 //#endif // _WIN32
 #endif // slic3r_TopBar_hpp_
diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp
index 0999861c76..baff15378e 100644
--- a/src/slic3r/GUI/UnsavedChangesDialog.cpp
+++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp
@@ -2067,7 +2067,7 @@ void DiffPresetDialog::button_event(Action act)
                                           get_selected_options(type));
             });
         else if (!presets_to_save.empty())
-            process_options([this](Preset::Type type) {
+            process_options([](Preset::Type type) {
                 if (Tab* tab = wxGetApp().get_tab(type)) {
                     tab->update_preset_choice();
                     wxGetApp().sidebar().update_presets(type);