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
This commit is contained in:
parent
35d764b08c
commit
4d2c67a9da
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -594,3 +594,4 @@ This function has not been tested with MDI frames.
|
||||
\wxheading{See also}
|
||||
|
||||
\helpref{wxFrame::IsFullScreen}{wxframeisfullscreen}
|
||||
|
||||
|
@ -320,6 +320,8 @@
|
||||
// Miscellaneous geometry code: needed for Canvas library
|
||||
#define wxUSE_GEOMETRY 1
|
||||
|
||||
// Use menus
|
||||
#define wxUSE_MENUS 1
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Optional controls
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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) \
|
||||
|
Loading…
Reference in New Issue
Block a user