juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-31 06:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Revert "[STUDIO-2186] hide PopupWindow on alt-tab"

Browse Source 
This reverts commit 3b8c11659a6cf3062ad27772348b84be5001a4f6.

Reason for revert: update pick

Change-Id: Id991af5b4a5950ee76ecf59176eabc72c885db88
This commit is contained in:
战马
2023-02-15 12:03:38 +08:00
committed by Lane.Wei
parent 5c61c834b0
commit 5f69f4c016
23 changed files with 70 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/wxExtensions.hpp
View File

@@ -16,7 +16,6 @@
#include <vector>
#include <functional>
#include "Widgets/PopupWindow.hpp"
#ifdef __WXMSW__
void msw_rescale_menu(wxMenu* menu);
@@ -393,7 +392,7 @@ private:
// ImageTransientPopup
// ----------------------------------------------------------------------------
class ImageTransientPopup : public PopupWindow
class ImageTransientPopup : public wxPopupTransientWindow
{
public:
ImageTransientPopup( wxWindow *parent, bool scrolled, wxBitmap bmp);
@@ -401,7 +400,7 @@ class ImageTransientPopup : public PopupWindow
void SetImage(wxBitmap bmp);
// PopupWindow virtual methods are all overridden to log them
// wxPopupTransientWindow virtual methods are all overridden to log them
virtual void Popup(wxWindow *focus = NULL) wxOVERRIDE;
virtual void OnDismiss() wxOVERRIDE;
virtual bool ProcessLeftDown(wxMouseEvent& event) wxOVERRIDE;