3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-11 16:00:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

update patch to include wxWidgets/wxWidgets@991a74c

Browse source
This commit is contained in:
Ocraftyone 2023-11-30 23:06:09 -05:00
parent 5ad3ce7924
commit 887ab5d833
No known key found for this signature in database
GPG key ID: 85836ED21AD4D125
1 changed files with 90 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

27
deps/wxWidgets/0001-patch-v3.2.1-for-OrcaSlicer.patch vendored
View file

@ -1,4 +1,4 @@
From 7eafe511eb7b1a234c5b956b45deb4865db75733 Mon Sep 17 00:00:00 2001 From f4fef135f0a58ca2916c45cd539923ab096935b6 Mon Sep 17 00:00:00 2001
From: Ocraftyone <Ocraftyone@users.noreply.github.com> From: Ocraftyone <Ocraftyone@users.noreply.github.com>
Date: Thu, 30 Nov 2023 03:25:54 -0500 Date: Thu, 30 Nov 2023 03:25:54 -0500
Subject: [PATCH] patch v3.2.1 for OrcaSlicer Subject: [PATCH] patch v3.2.1 for OrcaSlicer
@ -23,7 +23,8 @@ Subject: [PATCH] patch v3.2.1 for OrcaSlicer
src/msw/window.cpp | 52 +++++++++++++++++--------- src/msw/window.cpp | 52 +++++++++++++++++---------
src/osx/cocoa/dataview.mm | 26 +++++++++++-- src/osx/cocoa/dataview.mm | 26 +++++++++++--
src/osx/cocoa/settings.mm | 6 +-- src/osx/cocoa/settings.mm | 6 +--
19 files changed, 180 insertions(+), 56 deletions(-) src/osx/cocoa/window.mm | 4 ++
20 files changed, 184 insertions(+), 56 deletions(-)
diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
index 085381d785..62146abc04 100644 index 085381d785..62146abc04 100644
@ -655,6 +656,28 @@ index c819deeb0c..dc3c3b0b53 100644
return value; return value;
// TODO case wxSYS_FRAMESIZE_X: // TODO case wxSYS_FRAMESIZE_X:
diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index 635ea286d4..42ae67e27a 100644
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -191,6 +191,9 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
- (BOOL)isEnabled;
- (void)setEnabled:(BOOL)flag;
+- (BOOL)clipsToBounds;
+- (void)setClipsToBounds:(BOOL)clipsToBounds;
+
- (void)setImage:(NSImage *)image;
- (void)setControlSize:(NSControlSize)size;
@@ -2559,6 +2562,7 @@ wxWidgetImpl( peer, flags )
if ( m_osxView )
CFRetain(m_osxView);
[m_osxView release];
+ m_osxView.clipsToBounds = YES;
}
-- --
2.42.0.windows.2 2.42.0.windows.2