AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Various VC++ 1.5 and other corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2000-02-16 11:53:16 +00:00
parent 9e5c7daa4a
commit 2fa7c206f6
15 changed files with 222 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demos/forty/scorefil.cpp
View File

@ -38,7 +38,6 @@
#include "scorefil.h"
ScoreFile::ScoreFile(const char* appName)
{
#if 0

7
demos/forty/scorefil.h
View File

@ -15,7 +15,12 @@
#include <wx/config.h>
class wxConfig;
#ifdef __WIN16__
#include <wx/fileconf.h>
#undef wxConfig
#define wxConfig wxFileConfig
#endif
class ScoreFile {
public:

11
demos/life/dialogs.cpp
View File

@ -17,6 +17,17 @@
#pragma implementation "dialogs.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#include "wx/statline.h"
#include "wx/spinctrl.h"

18
demos/life/game.cpp
View File

@ -17,7 +17,19 @@
#pragma implementation "game.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#include "wx/log.h"
#include "wx/module.h"
#include "game.h"
#include <string.h> // for memset
@ -31,7 +43,13 @@
// ==========================================================================
#define HASH(x, y) (((x >> 3) & 0x7f) << 7) + ((y >> 3) & 0x7f)
#ifdef __WIN16__
#define HASHSIZE 10000
#else
#define HASHSIZE 32768
#endif
#define MAXDEAD 8

13
demos/life/life.cpp
View File

@ -17,6 +17,17 @@
#pragma implementation "life.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#include "wx/statline.h"
#include "life.h"
@ -459,7 +470,7 @@ void LifeCanvas::SetCellSize(int cellsize)
wxInt32 cy = m_viewportY + m_viewportH / 2;
// get current canvas size and adjust viewport accordingly
wxCoord w, h;
int w, h;
GetClientSize(&w, &h);
m_viewportW = (w + m_cellsize - 1) / m_cellsize;
m_viewportH = (h + m_cellsize - 1) / m_cellsize;

268
demos/poem/wxpoem.idx
View File

@ -1,137 +1,137 @@
135
0
432
678
849
1000
1289
1676
2036
2695
3247
3839
4214
4444
5002
5705
5943
6559
7236
7935
8387
8826
9065
9712
10030
10251
10488
10879
11165
11541
11679
12341
12952
13601
14037
14685
15355
16023
16480
16789
17472
18104
18634
19160
19828
20450
20892
21651
22144
22697
22863
23105
23495
23659
23858
24027
26188
26375
26605
27170
27341
27752
27912
28100
28298
28493
28705
28919
29336
29969
30491
30876
31495
32918
33373
33703
33830
34045
34223
34477
34889
35367
35760
35898
36461
36950
37417
39079
39455
40104
40787
42555
43641
45010
45571
46287
46870
47331
47808
48457
49704
50924
52070
52830
53582
54076
54328
54590
55064
55453
55643
56256
57048
57698
58621
59337
60780
61314
61518
61825
62104
62315
62462
62980
63167
63748
64581
65034
65343
66368
67140
68358
69033
69732
70434
71096
448
706
886
1046
1354
1754
2127
2806
3376
3992
4381
4620
5195
5918
6165
6801
7497
8216
8687
9145
9398
10065
10397
10631
10881
11290
11589
11981
12126
12807
13441
14112
14568
15238
15927
16617
17092
17415
18121
18775
19327
19870
20557
21198
21657
22441
22949
23526
23701
23954
24362
24535
24743
24921
27139
27335
27576
28162
28342
28766
28935
29132
29339
29543
29765
29989
30422
31079
31624
32028
32667
34127
34595
34937
35071
35295
35482
35745
36172
36665
37076
37225
37812
38323
38810
40525
40914
41585
42287
44104
45220
46627
47212
47952
48559
49044
49535
50201
51482
52736
53914
54701
55477
55990
56254
56527
57020
57428
57625
58263
59074
59747
60702
61439
62934
63483
63698
64019
64311
64531
64687
65222
65419
66021
66876
67342
67664
68721
69524
70788
71483
72201
72922
73604

48
docs/latex/wx/plotcurve.tex
View File

@ -26,13 +26,6 @@ and \helpref{GetY()}{wxplotcurvegety}).
Constructor assigning start values. See below for interpretation.
\membersection{wxPlotCurve::GetStartX}\label{wxplotcurvegetstartx}
\func{wxInt32}{GetStartX}{\void}
Must be overridden. This function should return the index of the first value
of this curve, typically zero.
\membersection{wxPlotCurve::GetEndX}\label{wxplotcurvegetendx}
\func{wxInt32}{GetEndX}{\void}
@ -40,6 +33,17 @@ of this curve, typically zero.
Must be overridden. This function should return the index of the last value
of this curve, typically 99 if 100 values have been measured.
\membersection{wxPlotCurve::GetEndY}\label{wxplotcurvegetendy}
\func{double}{GetEndY}{\void}
See \helpref{SetStartY}{wxplotcurvesetendy}.
\membersection{wxPlotCurve::GetOffsetY}\label{wxplotcurvegetoffsety}
\func{int}{GetOffsetY}{\void}
Returns the vertical offset.
\membersection{wxPlotCurve::GetY}\label{wxplotcurvegety}
\func{double}{GetY}{\param{wxInt32 }{x}}
@ -48,14 +52,12 @@ Must be overridden. This function will return the actual Y value corresponding
to the given X value. The x value is of an integer type because it is considered
to be an index in row of measured values.
\membersection{wxPlotCurve::SetStartY}\label{wxplotcurvesetstarty}
\membersection{wxPlotCurve::GetStartX}\label{wxplotcurvegetstartx}
\func{void}{SetStartY}{\param{double }{startY}}
\func{wxInt32}{GetStartX}{\void}
The value returned by this function tells the plot window what the lowest values
in the curve will be os that a suitable scale can be found for the display. If
the Y values in this curve are in the range of -1.5 to 0.5, this function should
return -1.5 or maybe -2.0 for nicer optics.
Must be overridden. This function should return the index of the first value
of this curve, typically zero.
\membersection{wxPlotCurve::GetStartY}\label{wxplotcurvegetstarty}
@ -68,15 +70,9 @@ See \helpref{SetStartY}{wxplotcurvesetstarty}.
\func{void}{SetEndY}{\param{double }{endY}}
The value returned by this function tells the plot window what the highest values
in the curve will be os that a suitable scale can be found for the display. If
in the curve will be so that a suitable scale can be found for the display. If
the Y values in this curve are in the range of -1.5 to 0.5, this function should
return 0.5 or maybe 1.0 for nicer optics.
\membersection{wxPlotCurve::GetEndY}\label{wxplotcurvegetendy}
\func{double}{GetEndY}{\void}
See \helpref{SetStartY}{wxplotcurvesetendy}.
return 0.5 or maybe 1.0 for nicer aesthetics.
\membersection{wxPlotCurve::SetOffsetY}\label{wxplotcurvesetoffsety}
@ -86,8 +82,12 @@ When displaying several curves in one window, it is often useful to assign
different offsets to the curves. You should call \helpref{wxPlotWindow::Move}{wxplotwindowmove}
to set this value after you have added the curve to the window.
\membersection{wxPlotCurve::GetOffsetY}\label{wxplotcurvegetoffsety}
\membersection{wxPlotCurve::SetStartY}\label{wxplotcurvesetstarty}
\func{int}{GetOffsetY}{\void}
\func{void}{SetStartY}{\param{double }{startY}}
The value returned by this function tells the plot window what the lowest values
in the curve will be so that a suitable scale can be found for the display. If
the Y values in this curve are in the range of -1.5 to 0.5, this function should
return -1.5 or maybe -2.0 for nicer aesthetics.
Returns the vertical offset.

2
include/wx/spinbutt.h
View File

@ -24,7 +24,7 @@
#include "wx/defs.h"
#ifdef wxUSE_SPINBTN
#if wxUSE_SPINBTN
#include "wx/control.h"
#include "wx/event.h"

4
src/common/doslex.c
View File

@ -145,7 +145,7 @@ int read();
} \
while ( 0 )
#else
// suppress expression always false warning
/* suppress expression always false warning */
int os2var = 0;
#define YY_FATAL_ERROR(msg) \
do \
@ -777,7 +777,7 @@ case YY_STATE_EOF(INITIAL):
}
}
#if defined(__VISAGECPP__)
// VA complains about proc maybe not returning a value so return one
/* VA complains about proc maybe not returning a value so return one */
return 0;
#endif
}

6
src/generic/calctrl.cpp
View File

@ -36,6 +36,9 @@
#include "wx/stattext.h"
#endif //WX_PRECOMP
// Can only use wxSpinEvent if this is enabled
#if wxUSE_SPINBTN
#include "wx/calctrl.h"
#define DEBUG_PAINT 0
@ -1033,3 +1036,6 @@ wxCalendarEvent::wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type)
{
m_date = cal->GetDate();
}
#endif // wxUSE_SPINBTN

2
src/generic/listctrl.cpp
View File

@ -1106,7 +1106,7 @@ BEGIN_EVENT_TABLE(wxListMainWindow,wxScrolledWindow)
EVT_KEY_DOWN (wxListMainWindow::OnKeyDown)
EVT_SET_FOCUS (wxListMainWindow::OnSetFocus)
EVT_KILL_FOCUS (wxListMainWindow::OnKillFocus)
EVT_SCROLL (wxListMainWindow::OnScroll)
EVT_SCROLLWIN (wxListMainWindow::OnScroll)
END_EVENT_TABLE()
wxListMainWindow::wxListMainWindow()

4
src/gtk/spinbutt.cpp
View File

@ -15,7 +15,7 @@
#include "wx/spinbutt.h"
#ifdef wxUSE_SPINBTN
#if wxUSE_SPINBTN
#include "wx/utils.h"
@ -104,7 +104,7 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
EVT_SIZE(wxSpinButton::OnSize)

4
src/gtk1/spinbutt.cpp
View File

@ -15,7 +15,7 @@
#include "wx/spinbutt.h"
#ifdef wxUSE_SPINBTN
#if wxUSE_SPINBTN
#include "wx/utils.h"
@ -104,7 +104,7 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxSpinButton,wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
BEGIN_EVENT_TABLE(wxSpinButton, wxControl)
EVT_SIZE(wxSpinButton::OnSize)

2
src/motif/spinbutt.cpp
View File

@ -16,7 +16,7 @@
#include "wx/spinbutt.h"
IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& WXUNUSED(pos), const wxSize& WXUNUSED(size),
long style, const wxString& name)

3
src/msw/spinbutt.cpp
View File

@ -38,6 +38,8 @@
#if wxUSE_SPINBTN
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxNotifyEvent)
#if defined(__WIN95__) && !defined(__TWIN32__)
#include "wx/spinbutt.h"
@ -56,7 +58,6 @@
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
// ----------------------------------------------------------------------------
// wxSpinButton