A few compile things.

Changed resizing of multi-line text ctrl.
  Augmented beta version to 8.
  Distribution things.


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

include/wx/busyinfo.h

@@ -3,6 +3,7 @@
 // Purpose:     Information window (when app is busy)
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
+// RCS-ID:      $Id$
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -10,26 +11,19 @@
 #define __INFOWIN_H__
 
 #ifdef __GNUG__
-#pragma implementation
+#pragma interface
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
-#ifndef WXPRECOMP
-#include <wx/wx.h>
-#endif
+#include "wx/frame.h"
 
 #if wxUSE_BUSYINFO
 
-#include <wx/dialog.h>
-
-
-
-
 class wxInfoFrame : public wxFrame
 {
     public:

include/wx/html/Makefile.am

@@ -14,6 +14,4 @@ htmlparser.h \
 htmltag.h \
 htmlwin.h \
 htmlwinparser.h \
-mod_templ.h \
-msw \
-version.h
+mod_templ.h

include/wx/log.h

@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/setup.h"
+#include "wx/string.h"
 
 // ----------------------------------------------------------------------------
 // forward declarations

include/wx/version.h

@@ -18,7 +18,7 @@
 #define wxRELEASE_NUMBER   0
 #define wxVERSION_STRING "wxWindows 2.1.0"
 #define wxVERSION_NUMBER (wxMAJOR_VERSION * 1000) + (wxMINOR_VERSION * 100) + wxRELEASE_NUMBER
-#define wxBETA_NUMBER      7
+#define wxBETA_NUMBER      8
 #define wxVERSION_FLOAT wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0)
 
 #endif

include/wx/zipstream.h

@@ -13,9 +13,11 @@
 #pragma interface
 #endif
 
-#if wxUSE_ZLIB && wxUSE_STREAMS && wxUSE_ZIPSTREAM
+#include "wx/defs.h"
 
-#include <wx/stream.h>
+#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 
+
+#include "wx/stream.h"
 
 //--------------------------------------------------------------------------------
 // wxZipInputStream
@@ -48,9 +50,11 @@ class WXDLLEXPORT wxZipInputStream : public wxInputStream
 };
 
 
-#endif // 
+#endif 
+   // wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 
 
-#endif // __ZIPSTREAM_H__
+#endif 
+   // __ZIPSTREAM_H__