QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-31 16:08:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

PRUSA 2.7.0

Browse Source
This commit is contained in:
sunsets
2023-12-27 18:02:35 +08:00
parent b33112327f
commit 0a3c63dcb1
488 changed files with 92371 additions and 29443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/GUI_ObjectManipulation.hpp
View File

@@ -9,6 +9,8 @@
#include "libslic3r/Point.hpp"
#include <float.h>
#include "Widgets/ComboBox.hpp"
#include "Widgets/TextInput.hpp"
#ifdef __WXOSX__
class wxBitmapComboBox;
#else
@@ -17,7 +19,6 @@ class wxComboBox;
class wxStaticText;
class LockButton;
class wxStaticBitmap;
class wxCheckBox;
namespace Slic3r {
namespace GUI {
@@ -26,6 +27,9 @@ namespace GUI {
class BitmapComboBox;
#endif
#if 1
using choice_ctrl = ::ComboBox;
#else
#ifdef __WXOSX__
static_assert(wxMAJOR_VERSION >= 3, "Use of wxBitmapComboBox on Manipulation panel requires wxWidgets 3.0 and newer");
using choice_ctrl = wxBitmapComboBox;
@@ -36,11 +40,12 @@ class BitmapComboBox;
using choice_ctrl = wxComboBox;
#endif
#endif // __WXOSX__
#endif
class Selection;
class ObjectManipulation;
class ManipulationEditor : public wxTextCtrl
class ManipulationEditor : public ::TextInput
{
std::string m_opt_key;
int m_axis;
@@ -124,7 +129,7 @@ private:
ScalableButton* m_reset_skew_button{ nullptr };
ScalableButton* m_drop_to_bed_button{ nullptr };
wxCheckBox* m_check_inch {nullptr};
wxWindow* m_check_inch {nullptr};
std::array<ScalableButton*, 3> m_mirror_buttons;
@@ -148,7 +153,7 @@ private:
choice_ctrl* m_word_local_combo { nullptr };
ScalableBitmap m_manifold_warning_bmp;
wxStaticBitmap* m_fix_throught_netfab_bitmap{ nullptr };
wxStaticBitmap* m_fix_by_winsdk_bitmap{ nullptr };
wxStaticBitmap* m_mirror_warning_bitmap{ nullptr };
// Currently focused editor (nullptr if none)