indentation, final newlines, spelling, remove unused members

This commit is contained in:
Paul Licameli 2017-10-19 13:08:04 -04:00
parent da5e5e51c9
commit 9612e3d971
16 changed files with 13 additions and 49 deletions

View File

@ -300,16 +300,15 @@ audio CDs]]."),
return WrapText(_("The Manual does not appear to be installed. \
Please [[*URL*|view the Manual online]].<br><br>\
To always view the Manual online, change \"Location of Manual\" in \
Interface Preferences to \"From Internet\".")
Interface Preferences to \"From Internet\"."));
#else
return WrapText(_("The Manual does not appear to be installed. \
Please [[*URL*|view the Manual online]] or \
[[http://manual.audacityteam.org/man/unzipping_the_manual.html| \
download the Manual]].<br><br>\
To always view the Manual online, change \"Location of Manual\" in \
Interface Preferences to \"From Internet\".")
Interface Preferences to \"From Internet\"."));
#endif
);
}
return wxT("");
}

View File

@ -62,4 +62,4 @@ wxString PlatformCompatibility::ConvertSlashInFileName(const wxString& filePath)
#else
return filePath;
#endif
}
}

View File

@ -701,7 +701,6 @@ wxMenu * ShuttleGuiBase::AddMenu( const wxString & Title )
wxStaticBox * ShuttleGuiBase::StartStatic(const wxString &Str, int iProp)
{
UseUpId();
mBoxName = Str;
if( mShuttleMode != eIsCreating )
return NULL;
wxStaticBox * pBox = safenew wxStaticBox(GetParent(), miId,
@ -2063,33 +2062,6 @@ GuiWaveTrack * ShuttleGui::AddGuiWaveTrack( const wxString & WXUNUSED(Name))
#endif
}
RulerPanel * ShuttleGui::AddRulerVertical(float low, float hi, const wxString & Units )
{
UseUpId();
if( mShuttleMode != eIsCreating )
return (RulerPanel*)NULL;
// return wxDynamicCast(wxWindow::FindWindowById( miId, mpDlg), RulerPanel);
RulerPanel * pRulerPanel;
miProp=0;
mpWind = pRulerPanel = safenew RulerPanel(
GetParent(),
miId,
wxDefaultPosition,
wxDefaultSize
);
Ruler & Ruler = pRulerPanel->ruler;
Ruler.SetOrientation(wxVERTICAL);
Ruler.SetBounds(0, 0, 100, 100); // Ruler can't handle small sizes
Ruler.SetRange(low, hi);
Ruler.SetFormat(Ruler::RealFormat);
Ruler.SetUnits(Units);
Ruler.SetLabelEdges(true);
mpWind->SetMinSize(wxSize(38,50));
UpdateSizers();
return pRulerPanel;
}
AttachableScrollBar * ShuttleGui::AddAttachableScrollBar( long style )
{
UseUpId();

View File

@ -264,7 +264,6 @@ public:
return mpParent;
}
ShuttleGuiBase & Prop( int iProp );
int GetId() {return miIdNext;};
void UseUpId();
wxSizer * GetSizer() {return mpSizer;}
@ -284,7 +283,6 @@ protected:
wxWindow * mpLastWind;
wxWindow * mpDlg;
wxSizer * pSizerStack[ nMaxNestedSizers ];
wxString mBoxName;
std::unique_ptr<Shuttle> mpShuttle; /*! Controls source/destination of shuttled data. You can
leave this NULL if you are shuttling to variables */
@ -328,7 +326,6 @@ extern void SetIfCreated( wxTextCtrl *&Var, wxTextCtrl * Val );
extern void SetIfCreated( wxStaticText *&Var, wxStaticText * Val );
class GuiWaveTrack;
class RulerPanel;
class AttachableScrollBar;
class ViewInfo;
#include <wx/scrolbar.h> // to get wxSB_HORIZONTAL
@ -376,12 +373,10 @@ public:
// Prop() sets the proportion value, defined as in wxSizer::Add().
ShuttleGui & Prop( int iProp ){ ShuttleGuiBase::Prop(iProp); return *this;}; // Has to be here too, to return a ShuttleGui and not a ShuttleGuiBase.
GuiWaveTrack * AddGuiWaveTrack( const wxString & Name);
RulerPanel * AddRulerVertical( float low, float hi, const wxString & Units );
AttachableScrollBar * AddAttachableScrollBar( long style = wxSB_HORIZONTAL );
void AddStandardButtons( long buttons = eOkButton | eCancelButton, wxButton *extra = NULL );
wxSizerItem * AddSpace( int width, int height );
wxSizerItem * AddSpace( int size ) { return AddSpace( size, size ); };
int GetBorder() { return miBorder; };
void SetSizeHints( int minX = -1, int minY = -1 );
void SetSizeHints( const wxArrayString & items );

View File

@ -772,4 +772,4 @@ void sincos_ps(v4sf x, v4sf *s, v4sf *c) {
*c = _mm_xor_ps(xmm2, sign_bit_cos);
}
#endif
#endif

View File

@ -123,7 +123,7 @@ public:
void WriteImageDefs( );
void WriteImageMap( );
static bool LoadPreferredTheme();
bool IsUsingSyestemTextColour(){ return bIsUsingSystemTextColour;};
bool IsUsingSystemTextColour(){ return bIsUsingSystemTextColour;};
void RecolourBitmap( int iIndex, wxColour From, wxColour To );
void RecolourTheme();

View File

@ -453,4 +453,4 @@ void EffectChangeTempo::Update_Text_ToLength()
m_pTextCtrl_ToLength->GetValidator()->TransferToWindow();
}
#endif // USE_SOUNDTOUCH
#endif // USE_SOUNDTOUCH

View File

@ -173,4 +173,4 @@ private:
#endif
#endif
#endif

View File

@ -553,4 +553,4 @@ void EffectPhaser::OnGainText(wxCommandEvent & WXUNUSED(evt))
}
mOutGainS->SetValue((int) (mOutGain * SCL_OutGain));
}
}

View File

@ -63,4 +63,4 @@ private:
wxString mPath;
};
#endif
#endif

View File

@ -890,4 +890,4 @@ void VampEffect::OnTextCtrl(wxCommandEvent & evt)
mSliders[p]->SetValue((int)(((val - lower) / range) * 1000.0 + 0.5));
}
#endif
#endif

View File

@ -187,7 +187,7 @@ void SelectionBar::Create(wxWindow * parent)
wxRadioButton * SelectionBar::AddRadioButton( const wxString & Name,
int id, wxSizer *pSizer, long style )
{
bool bUseNativeRadioButton = theTheme.IsUsingSyestemTextColour();
bool bUseNativeRadioButton = theTheme.IsUsingSystemTextColour();
wxRadioButton * pBtn;
// Safenew because the button is being create dinto this window.
pBtn = safenew wxRadioButton(this, id,bUseNativeRadioButton ? Name : wxT(""),

View File

@ -324,7 +324,6 @@ ToolBar::ToolBar( int type,
// Initialize everything
mParent = NULL;
mHSizer = NULL;
mSpacer = NULL;
mVisible = false;
mPositioned = false;

View File

@ -224,7 +224,6 @@ class ToolBar /* not final */ : public wxPanelWrapper
ToolBarResizer *mResizer;
wxBoxSizer *mHSizer;
wxSizerItem *mSpacer;
bool mVisible;
bool mResizable;

View File

@ -137,4 +137,4 @@ PopupMenuTable *NoteTrackControls::GetMenuExtension(Track *)
#endif
}
#endif
#endif

View File

@ -58,4 +58,4 @@ void TrackVRulerControls::DrawZooming
rect.SetRight(panelRect.GetWidth() - kRightMargin);
dc->DrawRectangle(rect);
}
}