Added wxUSE_MENUS to setup0.h to make menu sample compile;

updated some makefiles

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

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 7332ec3903ce867023f182294fe53950396fd9bc..c6a50e457a7a6777dea660fc576ee8c902d6eb9f 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -219,6 +219,18 @@ samples/dynamic/*.bmp
 samples/dynamic/*.rc
 samples/dynamic/*.wav
 
+samples/erase/*.cpp
+samples/erase/*.h
+samples/erase/*.def
+samples/erase/makefile*
+samples/erase/*.xbm
+samples/erase/*.xpm
+samples/erase/*.txt
+samples/erase/*.ico
+samples/erase/*.bmp
+samples/erase/*.rc
+samples/erase/*.wav
+
 samples/sockets/*.cpp
 samples/sockets/*.h
 samples/sockets/*.def

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index b7b4c27d4a4ef91223e4db44aeb6e6dad3bba334..95f970037bb57cc4476d6104f00f5f6044659368 100644 (file)
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -15,6 +15,7 @@ samples/docvwmdi/Makefile.in
 samples/dragimag/Makefile.in
 samples/drawing/Makefile.in
 samples/dynamic/Makefile.in
+samples/erase/Makefile.in
 samples/exec/Makefile.in
 samples/event/Makefile.in
 samples/grid/Makefile.in

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 872670f2d87e94bd6a220cd5e9781357b6fb23f5..78400b4d0f6c52c57c3144762228fa3f2914010b 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -64,6 +64,9 @@ samples/drawing/DrawingVC.dsw
 samples/dynamic/DynamicVC.dsp
 samples/dynamic/DynamicVC.dsw
 
+samples/dynamic/EraseVC.dsp
+samples/dynamic/EraseVC.dsw
+
 samples/event/EventVC.dsp
 samples/event/EventVC.dsw
 

diff --git a/docs/latex/wx/frame.tex b/docs/latex/wx/frame.tex
index 29c31e7c3b9bbcf7a2c04b3be3ebd3e24d65b36b..d4bd5a33a1f700ab251c09eeeee9fc94fa2499f8 100644 (file)
--- a/docs/latex/wx/frame.tex
+++ b/docs/latex/wx/frame.tex
@@ -594,3 +594,4 @@ This function has not been tested with MDI frames.
 \wxheading{See also}
 
 \helpref{wxFrame::IsFullScreen}{wxframeisfullscreen}
+

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 414f4ee124397199d6b25aea2a5085fdd3b72211..024c589f2c12385e6e94b53804e1a2bd090374d7 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -320,6 +320,8 @@
 // Miscellaneous geometry code: needed for Canvas library
 #define wxUSE_GEOMETRY            1
 
+// Use menus
+#define wxUSE_MENUS               1
 
 // ----------------------------------------------------------------------------
 // Optional controls

diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index 8162f96f6fb0f5dab4ab7bd661c6b6f1abb5d477..dde8738687f4f3da7728151566201f0bef85a09f 100644 (file)
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -18,8 +18,8 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "minimal.cpp"
-    #pragma interface "minimal.cpp"
+    #pragma implementation "erase.cpp"
+    #pragma interface "erase.cpp"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -157,10 +157,10 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
-    msg.Printf( _T("This is the about dialog of minimal sample.\n")
+    msg.Printf( _T("This is the about dialog of tghe Erase sample.\n")
                 _T("Welcome to %s"), wxVERSION_STRING);
 
-    wxMessageBox(msg, "About Minimal", wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(msg, "About Erase", wxOK | wxICON_INFORMATION, this);
 }
 
 

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 946f53fecdc30cf0c35ffcdbae3bd62161c37d40..ec9190b429eb3f66996e52956da16bc24b473b02 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -125,6 +125,7 @@ COMMONOBJS = \
                $(MSWDIR)\datetime.obj \
                $(MSWDIR)\datstrm.obj \
                $(MSWDIR)\db.obj \
+               $(MSWDIR)\dbgrid.obj \
                $(MSWDIR)\dbtable.obj \
                $(MSWDIR)\dcbase.obj \
                $(MSWDIR)\dircmn.obj \
@@ -627,6 +628,8 @@ $(MSWDIR)\datstrm.obj: $(COMMDIR)\datstrm.$(SRCSUFF)
 
 $(MSWDIR)\db.obj: $(COMMDIR)\db.$(SRCSUFF)
 
+$(MSWDIR)\dbgrid.obj: $(COMMDIR)\dbgrid.$(SRCSUFF)
+
 $(MSWDIR)\dbtable.obj: $(COMMDIR)\dbtable.$(SRCSUFF)
 
 $(MSWDIR)\dcbase.obj: $(COMMDIR)\dcbase.$(SRCSUFF)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index ae10387ffc83ba0bf7a5c1599e082bfe63f510c6..ef7dac03068fa481605cbb9d603d1b0fce8fa12d 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -110,6 +110,7 @@ COMMONOBJS  = \
                $(COMMDIR)/datetime.$(OBJSUFF) \
                $(COMMDIR)/datstrm.$(OBJSUFF) \
                $(COMMDIR)/db.$(OBJSUFF) \
+               $(COMMDIR)/dbgrid.$(OBJSUFF) \
                $(COMMDIR)/dbtable.$(OBJSUFF) \
                $(COMMDIR)/dcbase.$(OBJSUFF) \
                $(COMMDIR)/dircmn.$(OBJSUFF) \