Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 872338 ] Minor fixes to forty, fractal and poem demos

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-01-08 11:33:32 +00:00
parent 95f913a9d6
commit c4b7790106
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
demos/forty/scorefil.cpp
View File

@@ -91,15 +91,13 @@ void ScoreFile::GetPlayerList( wxArrayString &list )
if (length <= 0) return; if (length <= 0) return;
wxString player; wxString player;
long index, i = 0; long index;
if (m_config->GetFirstGroup(player, index)) if (m_config->GetFirstGroup(player, index))
{ {
list.Add( player ); list.Add( player );
i++;
while (m_config->GetNextGroup(player, index)) while (m_config->GetNextGroup(player, index))
{ {
list.Add( player ); list.Add( player );
i++;
} }
} }
} }

6
demos/fractal/fractal.cpp
View File

@@ -34,6 +34,10 @@ hack doesn't fix.
#include "wx/wxprec.h" #include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif //precompiled headers #endif //precompiled headers
@@ -117,7 +121,7 @@ END_EVENT_TABLE()
// My frame constructor // My frame constructor
MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size): MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
wxFrame(frame, -1, title, pos, size) wxFrame(frame, -1, title, pos, size, wxDEFAULT_FRAME_STYLE | wxFULL_REPAINT_ON_RESIZE)
{ {
} }

38
demos/poem/wxpoem.cpp
View File

@@ -177,7 +177,6 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
{ {
int i = pages[current_page]; int i = pages[current_page];
int ch = -1; int ch = -1;
int x = 10;
int y = 0; int y = 0;
int j; int j;
wxChar *line_ptr; wxChar *line_ptr;
@@ -219,7 +218,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
if (DrawIt) if (DrawIt)
{ {
x = (width - xx)/2; int x = (width - xx)/2;
dc->SetFont(* BoldFont); dc->SetFont(* BoldFont);
// Change text to BLACK! // Change text to BLACK!
@@ -292,7 +291,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
if (DrawIt) if (DrawIt)
{ {
x = (width - xx)/2; int x = (width - xx)/2;
dc->SetFont(* BoldFont); dc->SetFont(* BoldFont);
// Change text to BLACK! // Change text to BLACK!
@@ -315,7 +314,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
if (DrawIt) if (DrawIt)
{ {
x = (width - xx)/2; int x = (width - xx)/2;
dc->SetTextForeground(* wxBLACK); dc->SetTextForeground(* wxBLACK);
dc->DrawText(line_ptr, x, y); dc->DrawText(line_ptr, x, y);
} }
@@ -608,7 +607,13 @@ bool MyApp::OnInit()
// randomize(); // randomize();
pages[0] = 0; pages[0] = 0;
TheMainWindow = new MainWindow(NULL, 500, _T("wxPoem"), wxPoint(XPos, YPos), wxSize(100, 100), wxCAPTION|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxCLOSE_BOX); TheMainWindow = new MainWindow(NULL,
wxID_ANY,
_T("wxPoem"),
wxPoint(XPos, YPos),
wxSize(100, 100),
wxCAPTION|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxCLOSE_BOX|wxFULL_REPAINT_ON_RESIZE
);
#ifdef wx_x #ifdef wx_x
TheMainWindow->SetIcon(Icon(_T("wxpoem"))); TheMainWindow->SetIcon(Icon(_T("wxpoem")));
@@ -804,7 +809,6 @@ int LoadIndex(wxChar *file_name)
long data; long data;
FILE *index_file; FILE *index_file;
int i = 0;
wxChar buf[100]; wxChar buf[100];
if (file_name == NULL) if (file_name == NULL)
@@ -818,7 +822,7 @@ int LoadIndex(wxChar *file_name)
wxFscanf(index_file, _T("%ld"), &nitems); wxFscanf(index_file, _T("%ld"), &nitems);
for (i = 0; i < nitems; i++) for (int i = 0; i < nitems; i++)
{ {
wxFscanf(index_file, _T("%ld"), &data); wxFscanf(index_file, _T("%ld"), &data);
poem_index[i] = data; poem_index[i] = data;
@@ -832,9 +836,7 @@ int LoadIndex(wxChar *file_name)
// Get index // Get index
int GetIndex() int GetIndex()
{ {
int indexn = 0; int indexn = (int)(rand() % nitems);
indexn = (int)(rand() % nitems);
if ((indexn < 0) || (indexn > nitems)) if ((indexn < 0) || (indexn > nitems))
{ PoetryError(_T("No such poem!")); { PoetryError(_T("No such poem!"));
@@ -872,8 +874,6 @@ void WritePreferences()
// 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(wxChar *file_name, long position)
{ {
int ch = 0;
int i = 0;
// int j = 0; // int j = 0;
// int indexn = 0; // int indexn = 0;
wxChar buf[100]; wxChar buf[100];
@@ -907,8 +907,8 @@ bool LoadPoem(wxChar *file_name, long position)
fseek(data_file, data, SEEK_SET); fseek(data_file, data, SEEK_SET);
ch = 0; int ch = 0;
i = 0; int i = 0;
while ((ch != EOF) && (ch != '#')) while ((ch != EOF) && (ch != '#'))
{ {
ch = getc(data_file); ch = getc(data_file);
@@ -1040,9 +1040,8 @@ void PoetryNotify(wxChar *Msg, wxChar *caption)
bool Compile(void) bool Compile(void)
{ {
FILE *file; FILE *file;
long i = 0;
int j; int j;
int ch = 0; int ch;
wxChar buf[100]; wxChar buf[100];
if (data_filename) if (data_filename)
@@ -1063,10 +1062,9 @@ bool Compile(void)
nitems ++; nitems ++;
// Do rest // Do rest
while (ch != EOF)
{ do {
ch = getc(file); ch = getc(file);
i ++;
if (ch == '#') if (ch == '#')
{ {
ch = getc(file); ch = getc(file);
@@ -1075,7 +1073,7 @@ bool Compile(void)
poem_index[nitems] = data; poem_index[nitems] = data;
nitems ++; nitems ++;
} }
} } while (ch != EOF);
fclose(file); fclose(file);
if (index_filename) if (index_filename)