made code more const-correct to fix g++ warnings about converting literal strings to non-const char*

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-07-05 13:34:46 +00:00
parent 8eceaeb621
commit c2e5ea68a1

View File

@ -67,8 +67,8 @@ static int XPos; // Startup X position
static int YPos; // Startup Y position static int YPos; // Startup Y position
static int pointSize = 12; // Font size static int pointSize = 12; // Font size
static wxChar *index_filename = NULL; // Index filename static const wxChar *index_filename = NULL; // Index filename
static wxChar *data_filename = NULL; // Data filename static const wxChar *data_filename = NULL; // Data filename
static wxChar error_buf[300]; // Error message buffer static wxChar error_buf[300]; // Error message buffer
static bool loaded_ok = false; // Poem loaded ok static bool loaded_ok = false; // Poem loaded ok
static bool index_ok = false; // Index loaded ok static bool index_ok = false; // Index loaded ok
@ -82,9 +82,9 @@ wxBitmap *backingBitmap = NULL;
void PoetryError(const wxChar *, const wxChar *caption=_T("wxPoem Error")); void PoetryError(const wxChar *, const wxChar *caption=_T("wxPoem Error"));
void PoetryNotify(const wxChar *Msg, const wxChar *caption=_T("wxPoem")); void PoetryNotify(const wxChar *Msg, const wxChar *caption=_T("wxPoem"));
void TryLoadIndex(); void TryLoadIndex();
bool LoadPoem(wxChar *, long); bool LoadPoem(const wxChar *, long);
int GetIndex(); int GetIndex();
int LoadIndex(wxChar *); int LoadIndex(const wxChar *);
bool Compile(void); bool Compile(void);
void FindMax(int *max_thing, int thing); void FindMax(int *max_thing, int thing);
@ -706,7 +706,7 @@ void MyCanvas::OnChar(wxKeyEvent& event)
} }
// Load index file // Load index file
int LoadIndex(wxChar *file_name) int LoadIndex(const wxChar *file_name)
{ {
long data; long data;
FILE *index_file; FILE *index_file;
@ -778,7 +778,7 @@ void MainWindow::WritePreferences()
// Load a poem from given file, at given point in file. // Load a poem from given file, at given point in file.
// If position is > -1, use this for the position in the // If position is > -1, use this for the position in the
// file, otherwise use index[index_ptr] to find the correct position. // file, otherwise use index[index_ptr] to find the correct position.
bool LoadPoem(wxChar *file_name, long position) bool LoadPoem(const wxChar *file_name, long position)
{ {
// int j = 0; // int j = 0;
// int indexn = 0; // int indexn = 0;