mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-14 11:56:06 +08:00
Wrong build on windows system (32 vs 64bit) dialog
This commit is contained in:
parent
73af0ed331
commit
79d9fd154e
@ -812,6 +812,29 @@ bool GUI_App::OnInit()
|
|||||||
|
|
||||||
bool GUI_App::on_init_inner()
|
bool GUI_App::on_init_inner()
|
||||||
{
|
{
|
||||||
|
// win32 build on win64 and viceversa
|
||||||
|
#ifdef _WIN64
|
||||||
|
if (wxPlatformInfo::Get().GetArchName().substr(0, 2) == "") {
|
||||||
|
wxRichMessageDialog dlg(nullptr,
|
||||||
|
_L("You have started PrusaSlicer for 64-bit architecture on 32-bit system."
|
||||||
|
"\nPlease download and install correct version at https://www.prusa3d.cz/prusaslicer/."
|
||||||
|
"\nDo you wish to continue?"),
|
||||||
|
"PrusaSlicer", wxICON_QUESTION | wxYES_NO);
|
||||||
|
if (dlg.ShowModal() != wxID_YES)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#elif _WIN32
|
||||||
|
if (wxPlatformInfo::Get().GetArchName().substr(0, 2) == "64") {
|
||||||
|
wxRichMessageDialog dlg(nullptr,
|
||||||
|
_L("You have started PrusaSlicer for 32-bit architecture on 64-bit system."
|
||||||
|
"\nPlease download and install correct version at https://www.prusa3d.cz/prusaslicer/."
|
||||||
|
"\nDo you wish to continue?"),
|
||||||
|
"PrusaSlicer", wxICON_QUESTION | wxYES_NO);
|
||||||
|
if (dlg.ShowModal() != wxID_YES)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#endif // _WIN64
|
||||||
|
|
||||||
// Forcing back menu icons under gtk2 and gtk3. Solution is based on:
|
// Forcing back menu icons under gtk2 and gtk3. Solution is based on:
|
||||||
// https://docs.gtk.org/gtk3/class.Settings.html
|
// https://docs.gtk.org/gtk3/class.Settings.html
|
||||||
// see also https://docs.wxwidgets.org/3.0/classwx_menu_item.html#a2b5d6bcb820b992b1e4709facbf6d4fb
|
// see also https://docs.wxwidgets.org/3.0/classwx_menu_item.html#a2b5d6bcb820b992b1e4709facbf6d4fb
|
||||||
|
@ -112,7 +112,7 @@ enum class NotificationType
|
|||||||
// information about netfabb is finished repairing model (blocking proccess)
|
// information about netfabb is finished repairing model (blocking proccess)
|
||||||
NetfabbFinished,
|
NetfabbFinished,
|
||||||
// Short meesage to fill space between start and finish of export
|
// Short meesage to fill space between start and finish of export
|
||||||
ExportOngoing
|
ExportOngoing,
|
||||||
};
|
};
|
||||||
|
|
||||||
class NotificationManager
|
class NotificationManager
|
||||||
|
Loading…
x
Reference in New Issue
Block a user