1
0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-08 04:32:00 +01:00

apply parts of Campbell Bartons patch for cleaning up compiler warnings: add static qualifiers to methods, ensure prototypes match definitions and some whitespace and comment changes

This commit is contained in:
richardash1981
2013-02-22 21:29:19 +00:00
parent 9d0daf8662
commit b95918fe52
12 changed files with 73 additions and 67 deletions

View File

@@ -36,6 +36,8 @@ Gives an Error message with an option for help.
#include "../Project.h"
#include "../Prefs.h"
#include "ErrorDialog.h"
class ErrorDialog : public wxDialog
{
@@ -180,7 +182,10 @@ public:
}
};
void ShowHtmlText( wxWindow * pParent, const wxString &Title, const wxString &HtmlText, bool bIsFile = false, bool bModal = false )
void ShowHtmlText(wxWindow *pParent,
const wxString &Title,
const wxString &HtmlText,
bool bIsFile = false, bool bModal = false)
{
LinkingHtmlWindow *html;
@@ -283,7 +288,7 @@ void ErrorDialog::OnHelp(wxCommandEvent &event)
void ShowErrorDialog(wxWindow *parent,
const wxString &dlogTitle,
const wxString &message,
const wxString &message,
const wxString &helpURL,
const bool Close)
{
@@ -293,10 +298,10 @@ void ShowErrorDialog(wxWindow *parent,
}
void ShowModelessErrorDialog(wxWindow *parent,
const wxString &dlogTitle,
const wxString &message,
const wxString &helpURL,
const bool Close)
const wxString &dlogTitle,
const wxString &message,
const wxString &helpURL,
const bool Close)
{
ErrorDialog *dlog = new ErrorDialog(parent, dlogTitle, message, helpURL, Close, false);
dlog->CentreOnParent();
@@ -306,10 +311,10 @@ void ShowModelessErrorDialog(wxWindow *parent,
}
void ShowAliasMissingDialog(AudacityProject *parent,
const wxString &dlogTitle,
const wxString &message,
const wxString &helpURL,
const bool Close)
const wxString &dlogTitle,
const wxString &message,
const wxString &helpURL,
const bool Close)
{
ErrorDialog *dlog = new AliasedFileMissingDialog(parent, dlogTitle, message, helpURL, Close, false);
// Don't center because in many cases (effect, export, etc) there will be a progress bar in the center that blocks this.
@@ -335,7 +340,7 @@ void ShowAliasMissingDialog(AudacityProject *parent,
void ShowInfoDialog( wxWindow *parent,
const wxString &dlogTitle,
const wxString &shortMsg,
const wxString &message,
const wxString &message,
const int xSize, const int ySize)
{
wxDialog dlog(parent, wxID_ANY,
@@ -374,8 +379,8 @@ void ShowInfoDialog( wxWindow *parent,
void ShowHelpDialog(wxWindow *parent,
const wxString &localFileName,
const wxString &remoteURL)
const wxString &localFileName,
const wxString &remoteURL)
{
AudacityProject * pProj = GetActiveProject();
wxString HelpMode = wxT("Local");