clean up line wrap

stepmania/src/BitmapText.h

@@ -28,6 +28,7 @@ public:
 	bool LoadFromTextureAndChars( CString sTexturePath, CString sChars );
 	void SetText( CString sText, CString sAlternateText = "", int iWrapWidthPixels = -1 );
 	void SetTextMaxWidth( float MaxWidth, const CString &text, const CString &alttext = "" );
+	void SetWrapWidthPixels( int iWrapWidthPixels );
 
 	int GetWidestLineWidthInSourcePixels() { return m_iWidestLineWidth; };
 	void CropToWidth( int iWidthInSourcePixels );
@@ -40,21 +41,23 @@ public:
 	void SetHorizAlign( HorizAlign ha );
 	void SetVertAlign( VertAlign va );
 
-	CString GetText() const { return m_szText; }
+	CString GetText() const { return m_sText; }
 	/* Return true if the string 's' will use an alternate string, if available. */
 	bool StringWillUseAlternate(CString sText, CString sAlternateText) const;
 
+	virtual void HandleCommand( const CStringArray &asTokens );
+
 public:
 	Font* m_pFont;
 
 protected:
 	
 	// recalculate the items below on SetText()
-	CString			m_szText;
-	vector<wstring>	m_szTextLines;
+	CString			m_sText;
+	vector<wstring>	m_wTextLines;
 	vector<int>		m_iLineWidths;			// in source pixels
 	int				m_iWidestLineWidth;		// in source pixels
-
+	int				m_iWrapWidthPixels;	// -1 = no wrap
 
 	bool m_bRainbow;