diff --git a/src/slic3r/GUI/ImageGrid.cpp b/src/slic3r/GUI/ImageGrid.cpp
index ebfdb33ea4..ee3d531b2a 100644
--- a/src/slic3r/GUI/ImageGrid.cpp
+++ b/src/slic3r/GUI/ImageGrid.cpp
@@ -12,7 +12,7 @@
 
 wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent);
 
-BEGIN_EVENT_TABLE(Slic3r::GUI::ImageGrid, wxPanel)
+BEGIN_EVENT_TABLE(Slic3r::GUI::ImageGrid, wxWindow)
 
 EVT_MOTION(Slic3r::GUI::ImageGrid::mouseMoved)
 EVT_ENTER_WINDOW(Slic3r::GUI::ImageGrid::mouseEnterWindow)
diff --git a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp
index 21a420f5e4..8062cae815 100644
--- a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp
+++ b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp
@@ -14,7 +14,7 @@ static const wxColour text_num_color = wxColour(0x898989);
 static const wxColour BUTTON_PRESS_COL = wxColour(172, 172, 172);
 static const double sqrt2 = std::sqrt(2);
 
-BEGIN_EVENT_TABLE(AxisCtrlButton, wxPanel)
+BEGIN_EVENT_TABLE(AxisCtrlButton, wxWindow)
 EVT_LEFT_DOWN(AxisCtrlButton::mouseDown)
 EVT_LEFT_UP(AxisCtrlButton::mouseReleased)
 EVT_MOTION(AxisCtrlButton::mouseMoving)
diff --git a/src/slic3r/GUI/Widgets/ProgressBar.cpp b/src/slic3r/GUI/Widgets/ProgressBar.cpp
index 214e76db83..c89c14dd0f 100644
--- a/src/slic3r/GUI/Widgets/ProgressBar.cpp
+++ b/src/slic3r/GUI/Widgets/ProgressBar.cpp
@@ -7,7 +7,7 @@
 
 
 wxDEFINE_EVENT(wxCUSTOMEVT_SET_TEMP_FINISH, wxCommandEvent);
-BEGIN_EVENT_TABLE(ProgressBar, wxPanel)
+BEGIN_EVENT_TABLE(ProgressBar, wxWindow)
 EVT_PAINT(ProgressBar::paintEvent)
 END_EVENT_TABLE()
 
diff --git a/src/slic3r/GUI/Widgets/RoundedRectangle.cpp b/src/slic3r/GUI/Widgets/RoundedRectangle.cpp
index 07f2aa0b30..681251a764 100644
--- a/src/slic3r/GUI/Widgets/RoundedRectangle.cpp
+++ b/src/slic3r/GUI/Widgets/RoundedRectangle.cpp
@@ -3,7 +3,7 @@
 #include <wx/dcgraph.h>
 #include <wx/dcclient.h>
 
-BEGIN_EVENT_TABLE(RoundedRectangle, wxPanel)
+BEGIN_EVENT_TABLE(RoundedRectangle, wxWindow)
 EVT_PAINT(RoundedRectangle::OnPaint)
 END_EVENT_TABLE()
 
diff --git a/src/slic3r/GUI/Widgets/SideButton.cpp b/src/slic3r/GUI/Widgets/SideButton.cpp
index 53d7725fb2..b30bb0e80b 100644
--- a/src/slic3r/GUI/Widgets/SideButton.cpp
+++ b/src/slic3r/GUI/Widgets/SideButton.cpp
@@ -4,7 +4,7 @@
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
 
-BEGIN_EVENT_TABLE(SideButton, wxPanel)
+BEGIN_EVENT_TABLE(SideButton, wxWindow)
 EVT_LEFT_DOWN(SideButton::mouseDown)
 EVT_LEFT_UP(SideButton::mouseReleased)
 EVT_PAINT(SideButton::paintEvent)
diff --git a/src/slic3r/GUI/Widgets/SpinInput.cpp b/src/slic3r/GUI/Widgets/SpinInput.cpp
index 5c8b91a0c7..f5dbd92347 100644
--- a/src/slic3r/GUI/Widgets/SpinInput.cpp
+++ b/src/slic3r/GUI/Widgets/SpinInput.cpp
@@ -5,7 +5,7 @@
 
 #include <wx/dcgraph.h>
 
-BEGIN_EVENT_TABLE(SpinInput, wxPanel)
+BEGIN_EVENT_TABLE(SpinInput, StaticBox)
 
 EVT_KEY_DOWN(SpinInput::keyPressed)
 //EVT_MOUSEWHEEL(SpinInput::mouseWheelMoved)
diff --git a/src/slic3r/GUI/Widgets/TempInput.cpp b/src/slic3r/GUI/Widgets/TempInput.cpp
index f581f73bf1..37ed6f2fa6 100644
--- a/src/slic3r/GUI/Widgets/TempInput.cpp
+++ b/src/slic3r/GUI/Widgets/TempInput.cpp
@@ -8,7 +8,7 @@
 
 wxDEFINE_EVENT(wxCUSTOMEVT_SET_TEMP_FINISH, wxCommandEvent);
 
-BEGIN_EVENT_TABLE(TempInput, wxPanel)
+BEGIN_EVENT_TABLE(TempInput, StaticBox)
 EVT_MOTION(TempInput::mouseMoved)
 EVT_ENTER_WINDOW(TempInput::mouseEnterWindow)
 EVT_LEAVE_WINDOW(TempInput::mouseLeaveWindow)
diff --git a/src/slic3r/GUI/Widgets/TextInput.cpp b/src/slic3r/GUI/Widgets/TextInput.cpp
index 0aaeaa23da..06a81b2292 100644
--- a/src/slic3r/GUI/Widgets/TextInput.cpp
+++ b/src/slic3r/GUI/Widgets/TextInput.cpp
@@ -6,7 +6,7 @@
 #include <wx/dcclient.h>
 #include <wx/dcgraph.h>
 
-BEGIN_EVENT_TABLE(TextInput, wxPanel)
+BEGIN_EVENT_TABLE(TextInput, StaticBox)
 
 EVT_PAINT(TextInput::paintEvent)