-
-
Notifications
You must be signed in to change notification settings - Fork 114
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This one removes cURL completely (and wxEmail along with it) as I can't get it to compile with WinXP compatibility. The NOCURL preprocessor define will remove all cURL stuff and change the crash report dialog to remove the email sending stuff. This is probably the last thing I'm going to do for WinXP compatibility, if something breaks it in future I won't be fixing it (myself, at least) and official builds will no longer support it. Also, openal32.dll is actually still needed, apparently I have it in my windows/system32 folder >_>
- Loading branch information
1 parent
8c2a68c
commit 7162aa9
Showing
6 changed files
with
86 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -224,18 +224,26 @@ class SLADECrashDialog : public wxDialog, public wxThreadHelper | |
| hbox->Add(picture, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxTOP|wxBOTTOM, 10); | ||
|
|
||
| // Add general crash message | ||
| #ifndef NOCURL | ||
| string message = "SLADE has crashed unexpectedly. To help fix the problem that caused this crash, " | ||
| "please (optionally) enter a short description of what you were doing at the time " | ||
| "of the crash, and click the 'Send Crash Report' button."; | ||
| #else | ||
| string message = "SLADE has crashed unexpectedly. To help fix the problem that caused this crash, " | ||
| "please email a copy of the stack trace below to [email protected], along with a " | ||
| "description of what you were doing at the time of the crash."; | ||
| #endif | ||
| wxStaticText* label = new wxStaticText(this, -1, message); | ||
| hbox->Add(label, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 10); | ||
| label->Wrap(480 - 20 - picture->GetSize().x); | ||
|
|
||
| #ifndef NOCURL | ||
| // Add description text area | ||
| text_description = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxSize(-1, 100), wxTE_MULTILINE); | ||
| sizer->Add(new wxStaticText(this, -1, "Description:"), 0, wxLEFT|wxRIGHT, 10); | ||
| sizer->AddSpacer(2); | ||
| sizer->Add(text_description, 0, wxEXPAND|wxLEFT|wxRIGHT|wxBOTTOM, 10); | ||
| #endif | ||
|
|
||
| // SLADE info | ||
| trace = S_FMT("Version: %s\n", Global::version); | ||
|
|
@@ -278,12 +286,14 @@ class SLADECrashDialog : public wxDialog, public wxThreadHelper | |
| // Also dump stack trace to console | ||
| std::cerr << trace; | ||
|
|
||
| #ifndef NOCURL | ||
| // Add small privacy disclaimer | ||
| string privacy = "Sending a crash report will only send the information displayed above, " | ||
| "along with a copy of the logs for this session."; | ||
| label = new wxStaticText(this, -1, privacy); | ||
| label->Wrap(480); | ||
| sizer->Add(label, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxRIGHT|wxBOTTOM, 10); | ||
| #endif | ||
|
|
||
| // Add 'Copy Stack Trace' button | ||
| hbox = new wxBoxSizer(wxHORIZONTAL); | ||
|
|
@@ -298,10 +308,12 @@ class SLADECrashDialog : public wxDialog, public wxThreadHelper | |
| hbox->Add(btn_exit, 0, wxLEFT|wxRIGHT|wxBOTTOM, 4); | ||
| btn_exit->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &SLADECrashDialog::onBtnExit, this); | ||
|
|
||
| #ifndef NOCURL | ||
| // Add 'Send Crash Report' button | ||
| btn_send = new wxButton(this, -1, "Send Crash Report"); | ||
| hbox->Add(btn_send, 0, wxLEFT|wxRIGHT|wxBOTTOM, 4); | ||
| btn_send->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &SLADECrashDialog::onBtnSend, this); | ||
| #endif | ||
|
|
||
| Bind(wxEVT_THREAD, &SLADECrashDialog::onThreadUpdate, this); | ||
| Bind(wxEVT_CLOSE_WINDOW, &SLADECrashDialog::onClose, this); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters