From bf4d9b2b9be61f4b266ca5b5a302f7d6fbd51a2e Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 8 Feb 2000 19:25:48 +0000 Subject: [PATCH] ShowFullScreen (MSW) doc; projgen updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/g95.t | 4 +-- distrib/msw/tmake/vc.t | 58 ++++++++++++++++++++++++++++++++++++++ docs/latex/wx/frame.tex | 20 ++++++++++++- docs/msw/install.txt | 46 +++++++++++++++--------------- utils/projgen/makeproj.cpp | 2 +- 5 files changed, 102 insertions(+), 28 deletions(-) diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t index d830757770..a7ad909a72 100644 --- a/distrib/msw/tmake/g95.t +++ b/distrib/msw/tmake/g95.t @@ -384,10 +384,10 @@ $(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c $(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c $(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c - $(COPY) ../common/dosyacc.c ../common/y_tab.c + $(COPY) ..$(COPYSEP)common$(COPYSEP)dosyacc.c ..$(COPYSEP)common$(COPYSEP)y_tab.c $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c - $(COPY) ../common/doslex.c ../common/lex_yy.c + $(COPY) ..$(COPYSEP)common$(COPYSEP)doslex.c ..$(COPYSEP)common$(COPYSEP)lex_yy.c # Replace lex with flex if you run into compilation # problems with lex_yy.c. See also note about LEX_SCANNER diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 432f106017..e1b46894ee 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -258,6 +258,64 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp << +# Compile certain files with no optimization (some files cause a +# compiler crash for buggy versions of VC++, e.g. 4.0) +noopt: + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\datetime.obj /c /Tp $(COMMDIR)\datetime.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\encconv.obj /c /Tp $(COMMDIR)\encconv.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\choicdgg.obj /c /Tp $(GENDIR)\choicdgg.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\control.obj /c /Tp $(MSWDIR)\control.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\listbox.obj /c /Tp $(MSWDIR)\listbox.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\mdi.obj /c /Tp $(MSWDIR)\mdi.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\menu.obj /c /Tp $(MSWDIR)\menu.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\notebook.obj /c /Tp $(MSWDIR)\notebook.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\tbar95.obj /c /Tp $(MSWDIR)\tbar95.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp +<< + cl @<< +$(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp +<< + # If taking wxWindows from CVS, setup.h doesn't exist yet. # Actually the 'if not exist setup.h' test doesn't work # (copies the file anyway) diff --git a/docs/latex/wx/frame.tex b/docs/latex/wx/frame.tex index ba58e1fe8c..017a133f34 100644 --- a/docs/latex/wx/frame.tex +++ b/docs/latex/wx/frame.tex @@ -528,7 +528,6 @@ variable fields. \pythonnote{Only a single parameter is required, a Python list of integers.} - \membersection{wxFrame::SetToolBar}\label{wxframesettoolbar} \func{void}{SetToolBar}{\param{wxToolBar*}{ toolBar}} @@ -554,3 +553,22 @@ Sets the frame title. \helpref{wxFrame::GetTitle}{wxframegettitle} +\membersection{wxFrame::ShowFullScreen}\label{wxframeshowfullscreen} + +\func{bool}{ShowFullScreen}{\param{bool}{ show}, \param{long}{ style = wxFULLSCREEN\_ALL}} + +Passing TRUE to {\it shows} shows the frame full-screen, and passing FALSE restores the frame +again. {\it style} is a bit list containing some or all of the following values, which +indicate what elements of the frame to hide in full-screen mode: + +\begin{itemize}\itemsep=0pt +\item wxFULLSCREEN\_NOMENUBAR +\item wxFULLSCREEN\_NOTOOLBAR +\item wxFULLSCREEN\_NOSTATUSBAR +\item wxFULLSCREEN\_NOBORDER +\item wxFULLSCREEN\_NOCAPTION +\item wxFULLSCREEN\_ALL (all of the above) +\end{itemize} + +This function only works on Windows and has not been tested with MDI frames. + diff --git a/docs/msw/install.txt b/docs/msw/install.txt index 2e68fcd76a..cad4365402 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -171,7 +171,12 @@ Code' (and no others). This will then work. Similarly, in VC++ 4, optimization can cause internal compiler errors, so edit src\makevc.env and change /O1 to /Od before -trying build a release version of the library. +trying build a release version of the library. Or, type: + +nmake -f makefile.vc noopt FINAL=1 + +and then resume compilation in the normal way. This will build +troublesome files with no optimization. Note (4): some crash problems can be due to inconsistent compiler options. If strange/weird/impossible things start to happen please @@ -423,38 +428,30 @@ and other intermediate compiler files. Notes: -- See also the Cygwin/Mingw32 on the web site or CD-ROM for - further information about using wxWindows with these compilers. - -- libwx.a is 48 MB or more - but much less if compiled with no - debug info (-g0) and level 4 optimization (-O4). +1. See also the Cygwin/Mingw32 on the web site or CD-ROM for + further information about using wxWindows with these compilers. -- install.exe doesn't have built-in decompression because lzexpand.lib - isn't available with Cygwin. However, you can use it with external - decompression utilities. +2. libwx.a is 48 MB or more - but much less if compiled with no + debug info (-g0) and level 4 optimization (-O4). -- There's a bug in Mingw32 headers for some early distributions. +3. There's a bug in Mingw32 headers for some early distributions. - in include/windows32/defines.h, where it says: + in include/windows32/defines.h, where it says: - #define LPSTR_TEXTCALLBACKA (LPSTR)-1L) + #define LPSTR_TEXTCALLBACKA (LPSTR)-1L) - it should say: + it should say: - #define LPSTR_TEXTCALLBACKA ((LPSTR)-1L) + #define LPSTR_TEXTCALLBACKA ((LPSTR)-1L) - (a missing bracket). + (a missing bracket). -- If there's a problem with the copy command in - src/msw/makefile.g95, you may need to change the relevant - section to the following: +4. If there's a problem with the copy command in + src/msw/makefile.g95, you may need to change the COPY and + COPYSEP variables in makeg95.env. - COPY = command /c copy - $(COMMDIR)/y_tab.c: $(COMMDIR)/dosyacc.c - $(COPY) ..\\common\\dosyacc.c ..\\common\\y_tab.c - - $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c - $(COPY) ..\\common\\doslex.c ..\\common\\lex_yy.c +5. If there's a problem executing the windres program, try + commenting out RCPREPROCESSOR in makeg95.env. References: @@ -496,3 +493,4 @@ General Notes include/wx/msw/setup.h is missing. This is deliberate, to avoid developers' different setup.h configurations getting confused. Please copy setup0.h to setup.h before compiling. + diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp index 1d00771ccb..51e16013dd 100644 --- a/utils/projgen/makeproj.cpp +++ b/utils/projgen/makeproj.cpp @@ -274,7 +274,7 @@ void MyApp::GenerateSamples(const wxString& dir) GenerateSample("TaskbarVC", "tbtest", dir + wxString("/samples/taskbar"), wxStringList("tbtest.cpp", "tbtest.h", 0)); GenerateSample("TextVC", "text", dir + wxString("/samples/text"), wxStringList("text.cpp", 0)); GenerateSample("ThreadVC", "test", dir + wxString("/samples/thread"), wxStringList("test.cpp", 0)); - GenerateSample("ToolbarVC", "test", dir + wxString("/samples/toolbar"), wxStringList("test.cpp", "test.h", 0)); + GenerateSample("ToolbarVC", "toolbar", dir + wxString("/samples/toolbar"), wxStringList("toolbar.cpp", 0)); GenerateSample("TreectrlVC", "treetest", dir + wxString("/samples/treectrl"), wxStringList("treetest.cpp", "treetest.h", 0)); GenerateSample("TypetestVC", "typetest", dir + wxString("/samples/typetest"), wxStringList("typetest.cpp", "typetest.h", 0)); GenerateSample("ValidateVC", "validate", dir + wxString("/samples/validate"), wxStringList("validate.cpp", "validate.h", 0)); -- 2.45.2