mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Fixed missing wxEvent type on GCC, fixed some compiler warnings.
This commit is contained in:
parent
e3b858c45f
commit
0ec37ae038
3 changed files with 12 additions and 3 deletions
|
@ -126,8 +126,16 @@ private:
|
||||||
static bool is_end_of_line(char c) { return c == '\r' || c == '\n' || c == 0; }
|
static bool is_end_of_line(char c) { return c == '\r' || c == '\n' || c == 0; }
|
||||||
static bool is_end_of_gcode_line(char c) { return c == ';' || is_end_of_line(c); }
|
static bool is_end_of_gcode_line(char c) { return c == ';' || is_end_of_line(c); }
|
||||||
static bool is_end_of_word(char c) { return is_whitespace(c) || is_end_of_gcode_line(c); }
|
static bool is_end_of_word(char c) { return is_whitespace(c) || is_end_of_gcode_line(c); }
|
||||||
static const char* skip_whitespaces(const char *c) { for (; is_whitespace(*c); ++ c); return c; }
|
static const char* skip_whitespaces(const char *c) {
|
||||||
static const char* skip_word(const char *c) { for (; ! is_end_of_word(*c); ++ c); return c; }
|
for (; is_whitespace(*c); ++ c)
|
||||||
|
; // silence -Wempty-body
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
static const char* skip_word(const char *c) {
|
||||||
|
for (; ! is_end_of_word(*c); ++ c)
|
||||||
|
; // silence -Wempty-body
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
GCodeConfig m_config;
|
GCodeConfig m_config;
|
||||||
char m_extrusion_axis;
|
char m_extrusion_axis;
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#include "GUI_App.hpp"
|
#include "GUI_App.hpp"
|
||||||
|
|
||||||
#include <wx/app.h>
|
#include <wx/app.h>
|
||||||
#include <wx/event.h>
|
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/stdpaths.h>
|
#include <wx/stdpaths.h>
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
|
#include <wx/event.h>
|
||||||
|
|
||||||
#include "Print.hpp"
|
#include "Print.hpp"
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue