Fixed some typos, working on getting code to build.

This commit is contained in:
Joseph Lenox 2018-06-13 22:50:52 -05:00 committed by Joseph Lenox
parent b12b656bf7
commit d4f73ff1aa
3 changed files with 7 additions and 10 deletions

View File

@ -3,6 +3,7 @@
#include "GUI.hpp" #include "GUI.hpp"
#include <wx/bookctrl.h> #include <wx/bookctrl.h>
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {
PresetEditor::PresetEditor(wxWindow* parent, t_config_option_keys options) : PresetEditor::PresetEditor(wxWindow* parent, t_config_option_keys options) :
@ -80,10 +81,6 @@ void PresetEditor::select_preset(int id, bool force) {
this->_on_select_preset(force); this->_on_select_preset(force);
} }
// TODO
void PresetEditor::delete_preset() {
}
void PresetEditor::select_preset_by_name(const wxString& name, bool force) { void PresetEditor::select_preset_by_name(const wxString& name, bool force) {
const auto presets {SLIC3RAPP->presets.at(this->typeId())}; const auto presets {SLIC3RAPP->presets.at(this->typeId())};
int id = -1; int id = -1;
@ -100,14 +97,14 @@ void PresetEditor::select_preset_by_name(const wxString& name, bool force) {
PresetPage* PresetEditor::add_options_page(const wxString& _title, const wxString& _icon) { PresetPage* PresetEditor::add_options_page(const wxString& _title, const wxString& _icon) {
if (_icon.size() > 0) { if (_icon.size() > 0) {
auto* bitmap { new wxBitmap(var(_icon), wxBITMAPT_TYPE_PNG); auto* bitmap { new wxBitmap(var(_icon), wxBITMAP_TYPE_PNG);
this->_icons.Add(bitmap); this->_icons->Add(bitmap);
this->_iconcount += 1; this->_iconcount += 1;
} }
PresetPage* page {new PresetPage(this, _title, this->_iconcount)}; PresetPage* page {new PresetPage(this, _title, this->_iconcount)};
page->Hide(); page->Hide();
this->sizer->Add(page, 1, wxEXPAND | wxLEFT, 5); this->_sizer->Add(page, 1, wxEXPAND | wxLEFT, 5);
_pages.push_back(page); _pages.push_back(page);
return page; return page;
} }

View File

@ -280,7 +280,7 @@ protected:
class PresetPage : wxScrolledWindow { class PresetPage : public wxScrolledWindow {
public: public:
PresetPage(wxWindow* parent, wxString _title, int _iconID) : PresetPage(wxWindow* parent, wxString _title, int _iconID) :
wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL), wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL),

View File

@ -11,7 +11,7 @@ PrintEditor::PrintEditor(wxWindow* parent, t_config_option_keys options) :
this->_build(); this->_build();
} }
void PrintEditor::_update() { void PrintEditor::_update(const std::string& opt_key) {
} }
void PrintEditor::_build() { void PrintEditor::_build() {