diff options
| author | YuSanka <yusanka@gmail.com> | 2019-03-20 13:54:48 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2019-03-20 14:04:18 +0300 |
| commit | e2349bdd2eb99094c561e503bca8a7d3ed7ce70f (patch) | |
| tree | 022a1946b3fabd8a28cdcd0eb9dfc96dd3ef032f /src/slic3r/GUI/OptionsGroup.hpp | |
| parent | b36e4fa512fae110a5fba07bd22582294ae0dd8a (diff) | |
Added workaround for the non-editable wxBitmapComboBoxs under OSXDisableAllSmartSubstitutions
+ experiments with Linux
Diffstat (limited to 'src/slic3r/GUI/OptionsGroup.hpp')
| -rw-r--r-- | src/slic3r/GUI/OptionsGroup.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/slic3r/GUI/OptionsGroup.hpp b/src/slic3r/GUI/OptionsGroup.hpp index 661aadbd7..dbe1ea1a2 100644 --- a/src/slic3r/GUI/OptionsGroup.hpp +++ b/src/slic3r/GUI/OptionsGroup.hpp @@ -100,13 +100,13 @@ public: /// Accessor function is because users are not allowed to change the parent /// but defining it as const means a lot of const_casts to deal with wx functions. inline wxWindow* parent() const { -#ifdef __WXGTK__ +#if 0//#ifdef __WXGTK__ return m_panel; #else return m_parent; #endif /* __WXGTK__ */ } -#ifdef __WXGTK__ +#if 0//#ifdef __WXGTK__ wxWindow* get_parent() const { return m_parent; } @@ -176,7 +176,7 @@ public: m_grid_sizer = new wxFlexGridSizer(0, num_columns, 1,0); static_cast<wxFlexGridSizer*>(m_grid_sizer)->SetFlexibleDirection(wxBOTH/*wxHORIZONTAL*/); static_cast<wxFlexGridSizer*>(m_grid_sizer)->AddGrowableCol(label_width == 0 ? 0 : !extra_column ? 1 : 2 ); -#ifdef __WXGTK__ +#if 0//#ifdef __WXGTK__ m_panel = new wxPanel( _parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); sizer->Fit(m_panel); sizer->Add(m_panel, 0, wxEXPAND | wxALL, wxOSX||!staticbox ? 0: 5); @@ -204,7 +204,7 @@ protected: // This panel is needed for correct showing of the ToolTips for Button, StaticText and CheckBox // Tooltips on GTK doesn't work inside wxStaticBoxSizer unless you insert a panel // inside it before you insert the other controls. -#ifdef __WXGTK__ +#if 0//#ifdef__WXGTK__ wxPanel* m_panel {nullptr}; #endif /* __WXGTK__ */ |