Added new wxGrid classes. This is a work in progress !

Define wxUSE_NEW_GRID as 1 in setup.h to compile the new wxGrid
otherwise the old wxGrid class will be compiled.
Treat with caution and expect bugs and missing bits at this stage.


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

Makefile.in

@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 15:20, 1999/10/04
+# This file was automatically generated by tmake at 13:22, 1999/10/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -526,7 +526,7 @@ GENERIC_HEADERS = \
 		generic/dirdlgg.h \
 		generic/filedlgg.h \
 		generic/fontdlgg.h \
-		generic/gridg.h \
+		generic/grid.h \
 		generic/helpext.h \
 		generic/helphtml.h \
 		generic/helpwxht.h \
@@ -577,7 +577,7 @@ GTK_GENERICOBJS = \
 		dcpsg.o \
 		dirdlgg.o \
 		filedlgg.o \
-		gridg.o \
+		grid.o \
 		helphtml.o \
 		helpwxht.o \
 		imaglist.o \
@@ -610,7 +610,7 @@ GTK_GENERICDEPS = \
 		dcpsg.d \
 		dirdlgg.d \
 		filedlgg.d \
-		gridg.d \
+		grid.d \
 		helphtml.d \
 		helpwxht.d \
 		imaglist.d \
@@ -935,7 +935,7 @@ MOTIF_GENERICOBJS = \
 		dcpsg.o \
 		dirdlgg.o \
 		fontdlgg.o \
-		gridg.o \
+		grid.o \
 		helphtml.o \
 		helpwxht.o \
 		helpxlp.o \
@@ -972,7 +972,7 @@ MOTIF_GENERICDEPS = \
 		dcpsg.d \
 		dirdlgg.d \
 		fontdlgg.d \
-		gridg.d \
+		grid.d \
 		helphtml.d \
 		helpwxht.d \
 		helpxlp.d \
@@ -1297,7 +1297,7 @@ MSW_GENERICOBJS = \
 		busyinfo.o \
 		choicdgg.o \
 		dirdlgg.o \
-		gridg.o \
+		grid.o \
 		laywin.o \
 		logg.o \
 		numdlgg.o \
@@ -1319,7 +1319,7 @@ MSW_GENERICDEPS = \
 		busyinfo.d \
 		choicdgg.d \
 		dirdlgg.d \
-		gridg.d \
+		grid.d \
 		laywin.d \
 		logg.d \
 		numdlgg.d \
@@ -1821,55 +1821,16 @@ JPEGOBJS    = \
 		jquant2.o \
 		jdmerge.o
 
-BASE_OBJS = \
-    dynarray.o \
-    event.o \
-    hash.o \
-    intl.o \
-    init.o \
-    file.o \
-    filefn.o \
-    list.o \
-    log.o \
-    object.o \
-    string.o \
-    utilscmn.o \
-    utilsunx.o
 
-BASE_DEPS = \
+OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \
-    dynarray.d \
+	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
-    event.d \
-    hash.d \
-    intl.d \
-    init.d \
-    file.d \
-    filefn.d \
-    list.d \
-    log.d \
-    object.d \
-    string.d \
-    utilscmn.d \
-    utilsunx.d
 
-BASE_HEADERS =
+DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS)
 
-GUIOBJS = @GUIOBJS@
+HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
-GUIDEPS = @GUIDEPS@
+	  $(GENERIC_HEADERS) $(WX_HEADERS)
-GUIHEADERS = @GUIHEADERS@
-COMMONOBJS = @COMMONOBJS@
-COMMONDEPS = @COMMONDEPS@
-GENERICOBJS = @GENERICOBJS@
-GENERICDEPS = @GENERICDEPS@
-UNIXOBJS = @UNIXOBJS@
-UNIXDEPS = @UNIXDEPS@
 
-OBJECTS = @ALL_OBJECTS@
+all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
-
-DEPFILES = @ALL_DEPFILES@
-
-HEADERS = @ALL_HEADERS@
-
-all: @WX_CREATE_LINKS@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
@@ -1880,7 +1841,7 @@ all: @WX_CREATE_LINKS@
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
 	
-CREATE_LINKS: @WX_TARGET_LIBRARY@
+CREATE_LINKS@: @WX_TARGET_LIBRARY@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
 	@$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -2237,6 +2198,10 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
+	mkdir $(DISTDIR)/samples/newgrid
+	cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
+	cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
+	cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
 	mkdir $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook

configure.in

@@ -723,6 +723,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_COMBOBOX=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
+  DEFAULT_wxUSE_NEW_GRID=no
   DEFAULT_wxUSE_IMAGLIST=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
@@ -834,6 +835,7 @@ else
   DEFAULT_wxUSE_COMBOBOX=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
+  DEFAULT_wxUSE_NEW_GRID=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
@@ -936,6 +938,7 @@ if test "$wxUSE_GUI" = "no"; then
   DEFAULT_wxUSE_COMBOBOX=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
+  DEFAULT_wxUSE_NEW_GRID=no
   DEFAULT_wxUSE_IMAGLIST=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
@@ -1099,6 +1102,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
+  DEFAULT_wxUSE_NEW_GRID=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
@@ -1128,6 +1132,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
+  DEFAULT_wxUSE_NEW_GRID=no
   DEFAULT_wxUSE_IMAGLIST=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
@@ -1158,6 +1163,7 @@ WX_ARG_ENABLE(choice,      [  --enable-choice         use wxChoice class], wxUSE
 WX_ARG_ENABLE(combobox,    [  --enable-combobox       use wxComboBox classes], wxUSE_COMBOBOX)
 WX_ARG_ENABLE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
 WX_ARG_ENABLE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
+WX_ARG_ENABLE(newgrid,     [  --enable-newgrid        use new wxGrid class], wxUSE_NEW_GRID)
 WX_ARG_ENABLE(imaglist,    [  --enable-imaglist       use wxImageList class], wxUSE_IMAGLIST)
 WX_ARG_ENABLE(listbox,     [  --enable-listbox        use wxListBox class], wxUSE_LISTBOX)
 WX_ARG_ENABLE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wxUSE_LISTCTRL)
@@ -2592,6 +2598,11 @@ if test "$wxUSE_GRID" = "yes"; then
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
+if test "$wxUSE_NEW_GRID" = "yes"; then
+  AC_DEFINE(wxUSE_NEW_GRID)
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
+fi
+
 if test "$wxUSE_IMAGLIST" = "yes"; then
     AC_DEFINE(wxUSE_IMAGLIST)
 fi
@@ -2924,6 +2935,7 @@ AC_OUTPUT([
             samples/mdi/Makefile
             samples/minifram/Makefile
             samples/minimal/Makefile
+            samples/newgrid/Makefile
             samples/notebook/Makefile
             samples/printing/Makefile
             samples/proplist/Makefile

distrib/msw/tmake/filelist.txt

@@ -61,7 +61,7 @@ dcpsg.cpp	G	U
 dirdlgg.cpp	G	16
 fontdlgg.cpp	G	G,R
 filedlgg.cpp	G	U,X
-gridg.cpp	G
+grid.cpp	G
 helphtml.cpp	G	G
 helpwxht.cpp	G	G
 helpxlp.cpp	G	G,R
@@ -849,7 +849,7 @@ dcpsg.h	N
 dirdlgg.h	N
 fontdlgg.h	N
 filedlgg.h	N
-gridg.h	N
+grid.h	N
 helpext.h	N
 helpwxht.h	N
 helphtml.h	N

distrib/msw/tmake/unx.t

@@ -484,7 +484,7 @@ DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS)
 HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \
 	  $(GENERIC_HEADERS) $(WX_HEADERS)
 
-all: @WX_CREATE_LINKS@
+all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@
 
 @WX_LIBRARY_NAME_STATIC@:  $(OBJECTS)
 	@$(INSTALL) -d ./lib
@@ -495,7 +495,7 @@ all: @WX_CREATE_LINKS@
 	@$(INSTALL) -d ./lib
 	$(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS)
 	
-CREATE_LINKS: @WX_TARGET_LIBRARY@
+CREATE_LINKS@: @WX_TARGET_LIBRARY@
 	@$(RM) ./lib/@WX_LIBRARY_LINK1@
 	@$(RM) ./lib/@WX_LIBRARY_LINK2@
 	@$(RM) ./lib/@WX_LIBRARY_LINK3@
@@ -852,6 +852,10 @@ SAMPLES_DIST:
 	cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
 	cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
+	mkdir $(DISTDIR)/samples/newgrid
+	cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
+	cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
+	cp $(SAMPDIR)/newgrid/*.h $(DISTDIR)/samples/newgrid
 	mkdir $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/Makefile.in $(DISTDIR)/samples/notebook
 	cp $(SAMPDIR)/notebook/*.cpp $(DISTDIR)/samples/notebook

include/wx/grid.h

@@ -1,11 +1,7 @@
 #ifndef _WX_GRID_H_BASE_
 #define _WX_GRID_H_BASE_
 
-#include "wx/generic/gridg.h"
+#include "wx/generic/grid.h"
-
-#ifndef wxGrid
-#define wxGrid wxGenericGrid
-#endif
 
 #endif
     // _WX_GRID_H_BASE_

include/wx/msw/setup0.h

@@ -103,6 +103,11 @@
 
 #define wxUSE_CARET        1
                                 // Define 1 to use wxCaret class
+
+#define wxUSE_NEW_GRID     1
+                                // Define 1 to use the new wxGrid class
+                                // (still under development, define 0 to
+                                //  use existing wxGrid class)
 #define wxUSE_XPM_IN_MSW   1
                                 // Define 1 to support the XPM package in wxBitmap.
 #define wxUSE_IMAGE_LOADING_IN_MSW        1

setup.h.in

@@ -212,6 +212,11 @@
 /*
  * Use this control
  */
+#define wxUSE_NEW_GRID 0
+/*
+ * Use the new prototype wxGrid classes
+ * (wxUSE_GRID must also be defined)
+ */
 #define wxUSE_IMAGLIST 0
 /*
  * Use this control

src/msw/makefile.b32

@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 20:06, 1999/10/02
+# This file was automatically generated by tmake at 13:22, 1999/10/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -78,7 +78,7 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 		$(MSWDIR)\choicdgg.obj \
-		$(MSWDIR)\gridg.obj \
+		$(MSWDIR)\grid.obj \
 		$(MSWDIR)\laywin.obj \
 		$(MSWDIR)\logg.obj \
 		$(MSWDIR)\numdlgg.obj \
@@ -706,7 +706,7 @@ $(MSWDIR)\busyinfo.obj: $(GENDIR)\busyinfo.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
-$(MSWDIR)\gridg.obj: $(GENDIR)\gridg.$(SRCSUFF)
+$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
 
 $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 

src/msw/makefile.bcc

@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 20:06, 1999/10/02
+# This file was automatically generated by tmake at 13:22, 1999/10/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -76,7 +76,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 		$(MSWDIR)\choicdgg.obj \
 		$(MSWDIR)\dirdlgg.obj \
-		$(MSWDIR)\gridg.obj \
+		$(MSWDIR)\grid.obj \
 		$(MSWDIR)\imaglist.obj \
 		$(MSWDIR)\laywin.obj \
 		$(MSWDIR)\listctrl.obj \
@@ -586,7 +586,7 @@ $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
 $(MSWDIR)\dirdlgg.obj: $(GENDIR)\dirdlgg.$(SRCSUFF)
 
-$(MSWDIR)\gridg.obj: $(GENDIR)\gridg.$(SRCSUFF)
+$(MSWDIR)\grid.obj: $(GENDIR)\grid.$(SRCSUFF)
 
 $(MSWDIR)\imaglist.obj: $(GENDIR)\imaglist.$(SRCSUFF)
 

src/msw/makefile.dos

@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 20:06, 1999/10/02
+# This file was automatically generated by tmake at 13:22, 1999/10/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -62,7 +62,7 @@ MSWDIR=.
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\choicdgg.obj \
 		$(GENDIR)\dirdlgg.obj \
-		$(GENDIR)\gridg.obj \
+		$(GENDIR)\grid.obj \
 		$(GENDIR)\imaglist.obj \
 		$(GENDIR)\laywin.obj \
 		$(GENDIR)\listctrl.obj \
@@ -1046,7 +1046,7 @@ $(GENDIR)/dirdlgg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
-$(GENDIR)/gridg.obj:     $*.$(SRCSUFF)
+$(GENDIR)/grid.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<

src/msw/makefile.g295

@@ -1,5 +1,5 @@
 
-# This file was automatically generated by tmake at 13:53, 1999/09/14
+# This file was automatically generated by tmake at 13:22, 1999/10/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G295.T!
 
 #
@@ -39,8 +39,9 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
 		$(GENDIR)/choicdgg.$(OBJSUFF) \
-		$(GENDIR)/gridg.$(OBJSUFF) \
+		$(GENDIR)/grid.$(OBJSUFF) \
 		$(GENDIR)/laywin.$(OBJSUFF) \
+		$(GENDIR)/logg.$(OBJSUFF) \
 		$(GENDIR)/numdlgg.$(OBJSUFF) \
 		$(GENDIR)/panelg.$(OBJSUFF) \
 		$(GENDIR)/progdlgg.$(OBJSUFF) \
@@ -79,6 +80,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/fileconf.$(OBJSUFF) \
 		$(COMMDIR)/filefn.$(OBJSUFF) \
 		$(COMMDIR)/filesys.$(OBJSUFF) \
+		$(COMMDIR)/fontcmn.$(OBJSUFF) \
 		$(COMMDIR)/framecmn.$(OBJSUFF) \
 		$(COMMDIR)/fs_inet.$(OBJSUFF) \
 		$(COMMDIR)/fs_zip.$(OBJSUFF) \
@@ -88,6 +90,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/hash.$(OBJSUFF) \
 		$(COMMDIR)/helpbase.$(OBJSUFF) \
 		$(COMMDIR)/http.$(OBJSUFF) \
+		$(COMMDIR)/imagall.$(OBJSUFF) \
 		$(COMMDIR)/imagbmp.$(OBJSUFF) \
 		$(COMMDIR)/image.$(OBJSUFF) \
 		$(COMMDIR)/imaggif.$(OBJSUFF) \
@@ -116,6 +119,7 @@ COMMONOBJS  = \
 		$(COMMDIR)/sckfile.$(OBJSUFF) \
 		$(COMMDIR)/sckipc.$(OBJSUFF) \
 		$(COMMDIR)/sckstrm.$(OBJSUFF) \
+		$(COMMDIR)/serbase.$(OBJSUFF) \
 		$(COMMDIR)/sizer.$(OBJSUFF) \
 		$(COMMDIR)/socket.$(OBJSUFF) \
 		$(COMMDIR)/strconv.$(OBJSUFF) \
@@ -148,20 +152,20 @@ HTMLOBJS = \
 		$(HTMLDIR)/helpdata.$(OBJSUFF) \
 		$(HTMLDIR)/helpfrm.$(OBJSUFF) \
 		$(HTMLDIR)/htmlcell.$(OBJSUFF) \
-		$(HTMLDIR)/htmlfilter.$(OBJSUFF) \
+		$(HTMLDIR)/htmlfilt.$(OBJSUFF) \
-		$(HTMLDIR)/htmlparser.$(OBJSUFF) \
+		$(HTMLDIR)/htmlpars.$(OBJSUFF) \
 		$(HTMLDIR)/htmltag.$(OBJSUFF) \
 		$(HTMLDIR)/htmlwin.$(OBJSUFF) \
-		$(HTMLDIR)/htmlwinparser.$(OBJSUFF) \
+		$(HTMLDIR)/m_fonts.$(OBJSUFF) \
-		$(HTMLDIR)/mod_fonts.$(OBJSUFF) \
+		$(HTMLDIR)/m_hline.$(OBJSUFF) \
-		$(HTMLDIR)/mod_hline.$(OBJSUFF) \
+		$(HTMLDIR)/m_image.$(OBJSUFF) \
-		$(HTMLDIR)/mod_image.$(OBJSUFF) \
+		$(HTMLDIR)/m_layout.$(OBJSUFF) \
-		$(HTMLDIR)/mod_layout.$(OBJSUFF) \
+		$(HTMLDIR)/m_links.$(OBJSUFF) \
-		$(HTMLDIR)/mod_links.$(OBJSUFF) \
+		$(HTMLDIR)/m_list.$(OBJSUFF) \
-		$(HTMLDIR)/mod_list.$(OBJSUFF) \
+		$(HTMLDIR)/m_pre.$(OBJSUFF) \
-		$(HTMLDIR)/mod_pre.$(OBJSUFF) \
+		$(HTMLDIR)/m_tables.$(OBJSUFF) \
-		$(HTMLDIR)/mod_tables.$(OBJSUFF) \
+		$(HTMLDIR)/search.$(OBJSUFF) \
-		$(HTMLDIR)/search.$(OBJSUFF)
+		$(HTMLDIR)/winpars.$(OBJSUFF)
 
 MSWOBJS     = \
 		$(MSWDIR)/accel.$(OBJSUFF) \

src/msw/makefile.g95

@@ -1,5 +1,5 @@
 
-# This file was automatically generated by tmake at 20:06, 1999/10/02
+# This file was automatically generated by tmake at 13:22, 1999/10/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -40,7 +40,7 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
 		$(GENDIR)/choicdgg.$(OBJSUFF) \
 		$(GENDIR)/dirdlgg.$(OBJSUFF) \
-		$(GENDIR)/gridg.$(OBJSUFF) \
+		$(GENDIR)/grid.$(OBJSUFF) \
 		$(GENDIR)/laywin.$(OBJSUFF) \
 		$(GENDIR)/logg.$(OBJSUFF) \
 		$(GENDIR)/numdlgg.$(OBJSUFF) \

src/msw/makefile.sc

@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 20:06, 1999/10/02
+# This file was automatically generated by tmake at 13:22, 1999/10/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -28,7 +28,7 @@ MSWDIR=$(WXDIR)\src\msw
 
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\choicdgg.obj \
-		$(GENDIR)\gridg.obj \
+		$(GENDIR)\grid.obj \
 		$(GENDIR)\laywin.obj \
 		$(GENDIR)\logg.obj \
 		$(GENDIR)\numdlgg.obj \

src/msw/makefile.vc

@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:29, 1999/10/03
+# This file was automatically generated by tmake at 13:22, 1999/10/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -85,7 +85,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\choicdgg.obj \
-		..\generic\$D\gridg.obj \
+		..\generic\$D\grid.obj \
 		..\generic\$D\laywin.obj \
 		..\generic\$D\logg.obj \
 		..\generic\$D\numdlgg.obj \

src/msw/makefile.wat

@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 20:06, 1999/10/02
+# This file was automatically generated by tmake at 13:22, 1999/10/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #!/binb/wmake.exe
@@ -34,7 +34,7 @@ DOCDIR = $(WXDIR)\docs
 
 GENERICOBJS= busyinfo.obj &
 	choicdgg.obj &
-	gridg.obj &
+	grid.obj &
 	laywin.obj &
 	logg.obj &
 	numdlgg.obj &
@@ -833,7 +833,7 @@ busyinfo.obj:     $(GENDIR)\busyinfo.cpp
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-gridg.obj:     $(GENDIR)\gridg.cpp
+grid.obj:     $(GENDIR)\grid.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 laywin.obj:     $(GENDIR)\laywin.cpp