FIX:fix warning for icon_size define

jira: none
Change-Id: I0393677c5c29354aeca41917daecc87721d9d9ce
(cherry picked from commit 97584e0a1e73a0ce2152ce88c1ffd58abfc96c73)
This commit is contained in:
zhou.xu
2024-10-18 14:47:03 +08:00
committed by Noisyfox
parent 6c79e8262a
commit 78229089bf
10 changed files with 52 additions and 61 deletions

View File

@@ -31,7 +31,8 @@ class wxTopLevelWindow;
class wxRect;
#define wxVERSION_EQUAL_OR_GREATER_THAN(major, minor, release) ((wxMAJOR_VERSION > major) || ((wxMAJOR_VERSION == major) && (wxMINOR_VERSION > minor)) || ((wxMAJOR_VERSION == major) && (wxMINOR_VERSION == minor) && (wxRELEASE_NUMBER >= release)))
#define ICON_SINGLE_SIZE FromDIP(16)//don't change,if need new value,self create in cpp
#define ICON_SIZE wxSize(FromDIP(16), FromDIP(16))//don't change,if need new value,self create in cpp
namespace Slic3r {
namespace GUI {
@@ -186,7 +187,7 @@ public:
on_sys_color_changed();
event.Skip();
#endif // __WINDOWS__
});
if (std::is_same<wxDialog, P>::value) {
@@ -220,7 +221,7 @@ public:
on_sys_color_changed();
}
#endif
int ShowModal()
{
dialogStack.push_front(this);