Various VC++ 1.5 and other corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

demos/forty/scorefil.cpp

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

demos/forty/scorefil.h

@@ -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:

demos/life/dialogs.cpp

@@ -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"
 

demos/life/game.cpp

@@ -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
 
 

demos/life/life.cpp

@@ -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;

demos/poem/wxpoem.idx

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

docs/latex/wx/plotcurve.tex

@@ -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
+Must be overridden. This function should return the index of the first value
-in the curve will be os that a suitable scale can be found for the display. If
+of this curve, typically zero.
-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.
 
 \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.
+return 0.5 or maybe 1.0 for nicer aesthetics.
-
-\membersection{wxPlotCurve::GetEndY}\label{wxplotcurvegetendy}
-
-\func{double}{GetEndY}{\void}
-
-See \helpref{SetStartY}{wxplotcurvesetendy}.
 
 \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.

include/wx/spinbutt.h

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

src/common/doslex.c

@@ -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
     }

src/generic/calctrl.cpp

@@ -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
+

src/generic/listctrl.cpp

@@ -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()

src/gtk/spinbutt.cpp

@@ -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)

src/gtk1/spinbutt.cpp

@@ -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)

src/motif/spinbutt.cpp

@@ -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)

src/msw/spinbutt.cpp

@@ -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