diff --git a/distrib/msw/motif.rsp b/distrib/msw/motif.rsp index db6bd0600f..80fcea626e 100644 --- a/distrib/msw/motif.rsp +++ b/distrib/msw/motif.rsp @@ -29,6 +29,7 @@ include/wx/motif/*.h include/install-sh include/wx/install-sh +docs/base/*.txt docs/motif/*.txt docs/motif/makewxmotif diff --git a/distrib/msw/tardist b/distrib/msw/tardist index 9896e06500..cdd04ea1bb 100644 --- a/distrib/msw/tardist +++ b/distrib/msw/tardist @@ -1,9 +1,10 @@ #!/bin/sh # tardist: make up a tar.gz distribution of wxWindows 2 # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver) +# THIS SCRIPT IS OBSOLETE: USE E.G. TARWXMOTIF INSTEAD init="" -WXVER=2.1.16 +WXVER=2.2.1 if [ $1 = "" ] then exit diff --git a/distrib/msw/tarwxmotif b/distrib/msw/tarwxmotif index 839604113f..b2b59be0d3 100644 --- a/distrib/msw/tarwxmotif +++ b/distrib/msw/tarwxmotif @@ -3,7 +3,7 @@ # Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver) init="" -WXVER=2.2.0 +WXVER=2.2.1 if [ $1 = "" ] then exit diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat index 4d3f480616..feea1f6b4f 100755 --- a/distrib/msw/zipdist.bat +++ b/distrib/msw/zipdist.bat @@ -14,6 +14,7 @@ if "%1" == "--help" goto usage if "%1" == "/?" goto usage if "%1" == "wiseonly" goto dounzip if "%1" == "wise" set wise=1 +if "%1" == "tidyup" goto tidyup echo About to archive an external wxWindows distribution: echo From %src echo To %dest @@ -201,6 +202,7 @@ start %wisecmd pause Press any key to continue with the wxWindows distribution... Rem ren %WXWIN\deliver\setup.EXE %WXWIN\deliver\wxMSW-%version%-setup.exe +:tidyup cd %dest Rem tidy up capitalisation of filenames diff --git a/docs/html/makedist.htm b/docs/html/makedist.htm index bff3bce44c..e5b98f941d 100644 --- a/docs/html/makedist.htm +++ b/docs/html/makedist.htm @@ -87,7 +87,7 @@ by projgen).

  • Build the WinHelp, HTML, and PDF documentation via the VC++ makefile, src/msw/makefile.vc. You can use e.g. the targets cleandocs alldocs. Check the output of the Windows Help Compiler for missing links, and edit/recompile the docs if necessary. The PDF documentation is produced from the Word RTF -document, and read into Word. Apply the wxManual Style Template to improve presentation. Select all, press F9 to reformat the fields. Check the table of contents for +document, and read into Word. Apply the wxManual Style Template to improve presentation (Format|Style Gallery...). Select all, press F9 to reformat the fields. Check the table of contents for overspill from the body of a section into the TOC. If there's a problem, it's due to the lack of a blank line at the end of the relevant .tex file. Insert the blank line, regenerate the RTF, and reload into Word. Then use Adobe Distiller to generate the PDF.

    @@ -109,6 +109,7 @@ e.g. using distrib\msw\makeall.bat.

    to create .tgz files for wxMotif.

  • Upload the appropriate files to the SourceGear ftp site.

  • Download Robert's wxGTK files and upload to the SourceGear ftp site.

    +

  • Update the web site front page, news, download and CD-ROM pages to reflect the new version.

  • If updating the CD-ROM hierarchy as well, follow these steps using the CD-ROM makefile:
    1. Edit WXDISTDIR in the makefile and change to the correct distribution directory for this version. diff --git a/docs/html/news.htm b/docs/html/news.htm index d562cd3787..fa7bcad21e 100644 --- a/docs/html/news.htm +++ b/docs/html/news.htm @@ -18,6 +18,13 @@ News +

      August 13th, 2000

      + +

        +
      • wxWindows 2.2.1 is the latest official stable release. +The most bug-free, easiest-to-install release yet... +
      +

      July 28th, 2000

        diff --git a/docs/latex/wx/dc.tex b/docs/latex/wx/dc.tex index 7a5069793e..56a89cfbb9 100644 --- a/docs/latex/wx/dc.tex +++ b/docs/latex/wx/dc.tex @@ -377,8 +377,8 @@ Ends a document page (only relevant when outputting to a printer). \func{void}{FloodFill}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{const wxColour\&}{ colour}, \param{int}{ style=wxFLOOD\_SURFACE}} -Flood fills the device context starting from the given point, in the given colour, -and using a style: +Flood fills the device context starting from the given point, using +the {\it current brush colour}, and using a style: \begin{itemize}\itemsep=0pt \item wxFLOOD\_SURFACE: the flooding occurs until a colour other than the given colour is encountered. diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex index 594ec21503..4ffb1a704d 100644 --- a/docs/latex/wx/window.tex +++ b/docs/latex/wx/window.tex @@ -640,27 +640,6 @@ the button text. This function can be useful for meta-programs (such as testing tools or special-needs access programs) which need to identify windows by name. -\membersection{wxWindow::GetPosition} - -\constfunc{virtual void}{GetPosition}{\param{int* }{x}, \param{int* }{y}} - -This gets the position of the window in pixels, relative to the parent window or -if no parent, relative to the whole display. - -\wxheading{Parameters} - -\docparam{x}{Receives the x position of the window.} - -\docparam{y}{Receives the y position of the window.} - -\pythonnote{In place of a single overloaded method name, wxPython -implements the following methods:\par -\indented{2cm}{\begin{twocollist} -\twocolitem{{\bf GetPosition()}}{Returns a wxPoint} -\twocolitem{{\bf GetPositionTuple()}}{Returns a tuple (x, y)} -\end{twocollist}} -} - \membersection{wxWindow::GetName}\label{wxwindowgetname} \constfunc{virtual wxString }{GetName}{\void} @@ -682,6 +661,29 @@ name in the window constructor or via \helpref{wxWindow::SetName}{wxwindowsetnam Returns the parent of the window, or NULL if there is no parent. +\membersection{wxWindow::GetPosition}\label{wxwindowgetposition} + +\constfunc{virtual void}{GetPosition}{\param{int* }{x}, \param{int* }{y}} + +\constfunc{wxPoint}{GetPosition}{\void} + +This gets the position of the window in pixels, relative to the parent window or +if no parent, relative to the whole display. + +\wxheading{Parameters} + +\docparam{x}{Receives the x position of the window.} + +\docparam{y}{Receives the y position of the window.} + +\pythonnote{In place of a single overloaded method name, wxPython +implements the following methods:\par +\indented{2cm}{\begin{twocollist} +\twocolitem{{\bf GetPosition()}}{Returns a wxPoint} +\twocolitem{{\bf GetPositionTuple()}}{Returns a tuple (x, y)} +\end{twocollist}} +} + \membersection{wxWindow::GetRect}\label{wxwindowgetrect} \constfunc{virtual wxRect}{GetRect}{\void} diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index b5f6ae3e25..801efbb5de 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -686,9 +686,9 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) wxPoint(165, 115), wxDefaultSize, WXSIZEOF(choices10), choices10, 3, wxRA_SPECIFY_COLS); - radio2->SetToolTip("Test tooltip"); #if wxUSE_TOOLTIPS + radio2->SetToolTip("Test tooltip"); m_combo->SetToolTip("This is a natural\ncombobox - can you believe me?"); m_radio->SetToolTip("Ever seen a radiobox?"); #endif // wxUSE_TOOLTIPS diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 55b68053ff..749470bee7 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -6,7 +6,6 @@ * Copyright: (C) 1998, Robert Roebling * */ - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -340,7 +339,8 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.SetTextForeground( "BLACK" ); } - + // Doesn't work for wxMotif yet +#ifndef __WXMOTIF__ wxBitmap mono( 60,50,1 ); wxMemoryDC memdc; memdc.SelectObject( mono ); @@ -376,6 +376,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) dc.DrawBitmap( i.ConvertToBitmap(), 150, 1900, TRUE ); dc.SetTextForeground( "BLACK" ); } +#endif dc.DrawText("XPM bitmap", 30, 2000); if ( m_bmpSmileXpm.Ok() )