mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-03 07:16:52 +00:00
56f9edc572
* chore: mark every declaration that overrides a base virtual clang-cl reports 42 member functions across 28 files that override a base virtual without being marked `override`, inside classes that already mark their other overrides. That is every occurrence of -Winconsistent-missing-override in the tree, so the category drops to zero and -Werror=inconsistent-missing-override becomes available as a guard against it coming back. Behaviour is unchanged. Each keyword goes only where clang had already resolved the declaration to a base virtual, so it records what the compiler already worked out and cannot affect overload resolution or dispatch. If any of these signatures had not really overridden a base method, the build would have failed rather than warned. Where a declaration already carried `virtual` it is left alone and the keyword appended, matching the surrounding declarations. Plain `override` is used rather than the wxWidgets `wxOVERRIDE` macro, which wx/defs.h defines as `override` beneath a comment marking it obsolete, and which the rest of src/slic3r already avoids by 1742 occurrences to 113. A full clang-cl build takes -Winconsistent-missing-override from 1,146 warning lines to 0. Those 42 declarations produce that many lines because a header is re-diagnosed in every translation unit that includes it. CalibrationWizardStartPage.hpp alone accounts for 336 of them from 4 declarations. * chore: drop unused lambda captures in GUI/Widgets clang-cl reports 10 lambda captures in src/slic3r/GUI/Widgets that are never read. Removing them changes nothing at runtime. Every capture removed is `this` or a raw pointer. clang does not report a capture whose type has a non-trivial destructor, since such a capture can be held purely for its effect on an object's lifetime, so nothing that owns or extends a lifetime is touched. The std::weak_ptr captured beside the removed `this` in MultiNozzleSync.cpp stays. This clears the category in GUI/Widgets only. A full clang-cl build takes -Wunused-lambda-capture from 312 warning lines to 302, leaving 235 sites in other directories for a follow-up.
91 lines
2.3 KiB
C++
91 lines
2.3 KiB
C++
#ifndef slic3r_GUI_TextInput_hpp_
|
|
#define slic3r_GUI_TextInput_hpp_
|
|
|
|
#include <wx/textctrl.h>
|
|
#include "StaticBox.hpp"
|
|
|
|
class TextInput : public wxNavigationEnabled<StaticBox>
|
|
{
|
|
|
|
wxSize labelSize;
|
|
ScalableBitmap icon;
|
|
ScalableBitmap icon_1;
|
|
StateColor label_color;
|
|
StateColor text_color;
|
|
wxTextCtrl * text_ctrl;
|
|
|
|
wxString static_tips;
|
|
wxSize static_tips_size;
|
|
wxBitmap static_tips_icon;
|
|
|
|
static const int TextInputWidth = 200;
|
|
static const int TextInputHeight = 50;
|
|
|
|
public:
|
|
TextInput();
|
|
|
|
TextInput(wxWindow * parent,
|
|
wxString text,
|
|
wxString label = "",
|
|
wxString icon = "",
|
|
const wxPoint &pos = wxDefaultPosition,
|
|
const wxSize & size = wxDefaultSize,
|
|
long style = 0);
|
|
|
|
public:
|
|
void Create(wxWindow * parent,
|
|
wxString text,
|
|
wxString label = "",
|
|
wxString icon = "",
|
|
const wxPoint &pos = wxDefaultPosition,
|
|
const wxSize & size = wxDefaultSize,
|
|
long style = 0);
|
|
|
|
void SetCornerRadius(double radius);
|
|
|
|
// Only meant to be used by inspector, not public API
|
|
int GetCornerRadius() const { return static_cast<int>(radius); }
|
|
|
|
void SetLabel(const wxString& label) override;
|
|
|
|
void SetStaticTips(const wxString& tips, const wxBitmap& bitmap);
|
|
|
|
void SetIcon(const wxBitmap & icon);
|
|
void SetIcon(const wxString & icon);
|
|
|
|
void SetIcon_1(const wxString &icon);
|
|
|
|
void SetLabelColor(StateColor const &color);
|
|
|
|
void SetTextColor(StateColor const &color);
|
|
|
|
virtual void Rescale();
|
|
|
|
virtual bool Enable(bool enable = true) override;
|
|
|
|
virtual void SetMinSize(const wxSize& size) override;
|
|
|
|
wxTextCtrl *GetTextCtrl() { return text_ctrl; }
|
|
|
|
wxTextCtrl const *GetTextCtrl() const { return text_ctrl; }
|
|
|
|
protected:
|
|
virtual void OnEdit() {}
|
|
|
|
virtual void DoSetSize(
|
|
int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO) override;
|
|
|
|
void DoSetToolTipText(wxString const &tip) override;
|
|
|
|
private:
|
|
void paintEvent(wxPaintEvent& evt);
|
|
|
|
void render(wxDC& dc);
|
|
|
|
void messureSize();
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
};
|
|
|
|
#endif // !slic3r_GUI_TextInput_hpp_
|