From dab73021272104a5997f43658831658d8a783474 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 1 Jun 2003 12:34:12 +0000 Subject: [PATCH] Added BCC include dir in XRC makefile Typo correction in app.tex git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/xrc/makefile.b32 | 2 +- docs/latex/wx/app.tex | 2 +- docs/publicity/slogans.txt | 55 ++++++++++++++++++++++++++++++++++++ docs/toback24.txt | 5 ---- samples/minimal/minimal.cpp | 2 +- src/xrc/makefile.b32 | 2 +- 6 files changed, 59 insertions(+), 9 deletions(-) diff --git a/contrib/src/xrc/makefile.b32 b/contrib/src/xrc/makefile.b32 index 8819c5f7ce..406072e62a 100644 --- a/contrib/src/xrc/makefile.b32 +++ b/contrib/src/xrc/makefile.b32 @@ -13,7 +13,7 @@ expat_dir = $(WXDIR)\contrib\src\xrc\expat XMLPARSEDIR = $(expat_dir)\xmlparse XMLTOKDIR = $(expat_dir)\xmltok -EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok +EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok -I$(BCCDIR)\include EXPAT_OBJECTS=xmltok.obj xmlrole.obj xmlparse.obj EXTRACPPFLAGS=$(wxLIBXMLDIR) $(EXPAT_DEFS) diff --git a/docs/latex/wx/app.tex b/docs/latex/wx/app.tex index e54aa88be9..4908d31e6f 100644 --- a/docs/latex/wx/app.tex +++ b/docs/latex/wx/app.tex @@ -130,7 +130,7 @@ manner to refer to the application. \membersection{wxApp::GetExitOnFrameDelete}\label{wxappgetexitonframedelete} -\constfunc{bool}{GetExitFrameOnDelete}{\void} +\constfunc{bool}{GetExitOnFrameDelete}{\void} Returns true if the application will exit when the top-level window is deleted, false otherwise. diff --git a/docs/publicity/slogans.txt b/docs/publicity/slogans.txt index 3e4ab7d1bc..1b8e17e620 100644 --- a/docs/publicity/slogans.txt +++ b/docs/publicity/slogans.txt @@ -113,3 +113,58 @@ words at the bottom. ============================ +wxWindows: Write it once and for all. + +Matt Gregory + +============================ + + +At front: + + Need an API? + + and get THE API + + C++, Python, Basic, Lua ... + +At back + + OR OR ? + is + AND AND + +where is the respective logo + +Manuel Martin + +============================ + + +Kevin Ollivier wrote: +How about this for a t-shirt slogan? + +One API to rule them all, one API to hide them +One API to bridge them all and in the compiler bind them. + +wxWindows + +How about "and in the linker bind them"? That's where the local libraries +get bound to the wxWindows code anyway. + +============================ + +Hugh Gibson wrote: +> > Perhaps a head shot of a Maori with full face tattoo and the +> > slogan "Go native"? +> +> Perhaps the "tattoos" could be various representations of a common +> window control in different operating systems to emphasise the +> native look and feel. + +Nice idea. But I wonder where you'll find some volunteer willing to +have his face tattooed with win32 common controls ;-) + +============================ + + diff --git a/docs/toback24.txt b/docs/toback24.txt index 992fd15167..0bddb9270e 100644 --- a/docs/toback24.txt +++ b/docs/toback24.txt @@ -167,11 +167,6 @@ Checking in include/wx/textbuf.h; new revision: 1.8; previous revision: 1.7 -19. Add wxFileConfig bug fix, marked by ... in Parse(). -This prevents mungeing of the config file after reading in -entries (say, just one entry in one group), then adding entries -to a different group. - 20. Bug fix for clicking on a panel not giving focus to it: http://sf.net/tracker/?func=detail&aid=215436&group_id=9863&atid=109863 diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index 29ea39bf0d..8298169a69 100644 --- a/samples/minimal/minimal.cpp +++ b/samples/minimal/minimal.cpp @@ -103,7 +103,7 @@ END_EVENT_TABLE() // Create a new application object: this macro will allow wxWindows to create // the application object during program execution (it's better than using a -// static object for many reasons) and also declares the accessor function +// static object for many reasons) and also implements the accessor function // wxGetApp() which will return the reference of the right type (i.e. MyApp and // not wxApp) IMPLEMENT_APP(MyApp) diff --git a/src/xrc/makefile.b32 b/src/xrc/makefile.b32 index 8819c5f7ce..406072e62a 100644 --- a/src/xrc/makefile.b32 +++ b/src/xrc/makefile.b32 @@ -13,7 +13,7 @@ expat_dir = $(WXDIR)\contrib\src\xrc\expat XMLPARSEDIR = $(expat_dir)\xmlparse XMLTOKDIR = $(expat_dir)\xmltok -EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok +EXPAT_DEFS=-I$(expat_dir)\xmlparse -I$(expat_dir)\xmltok -I$(BCCDIR)\include EXPAT_OBJECTS=xmltok.obj xmlrole.obj xmlparse.obj EXTRACPPFLAGS=$(wxLIBXMLDIR) $(EXPAT_DEFS) -- 2.47.2