Small fixes

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

distrib/msw/msw.rsp

@@ -1,4 +1,5 @@
 docs/msw/*.txt
+docs/licence.txt
 
 src/makeb32.env
 src/makebcc.env

docs/licence.txt

@@ -11,7 +11,7 @@ This licence is intended to protect wxWindows, its developers,
 and its users, so that the considerable investment it represents
 is not abused.
 
-Unlike the wxWindows licence, you as a user are not obliged to
+Unlike the L-GPL licence, you as a user are not obliged to
 distribute wxWindows source code with your products. However,
 you are prevented from selling the code without permission from
 the authors, or denying others the rights to use or distribute

docs/msw/changes.txt

@@ -2,6 +2,19 @@
 wxWindows 2.0 for Windows Change Log
 ------------------------------------
 
+Alpha 14, July 31st 1998
+------------------------
+
+- Toolbar API has been simplified, and now
+  wxFrame::GetClientArea returns the available client
+  area when toolbar, status bar etc. have been accounted for.
+  wxFrame::CreateToolBar added in line with CreateStatusBar.
+- Documentation updates, incl. for wxToolBar.
+- New wxAcceleratorTable class plus wxFrame::SetAcceleratorTable.
+- Various additions from other folk, e.g. streams, wxConfig
+  changes, wxNotebook.
+- Added wxDocMDIParentFrame, wxDocMDIChildFrame for doc/view.
+
 Alpha 13, July 8th 1998
 -----------------------
 

docs/msw/todo.txt

@@ -45,6 +45,7 @@ Update manual.
     wxString            PARTLY DONE
     Drag and drop (change API if required, e.g. const).
     wxCheckListBox
+    wxAcceleratorTable
     wxBaseArray, other arrays
     (wxOwnerDrawn)
     Document the include file for each class

include/wx/msw/combobox.h

@@ -68,6 +68,10 @@ class WXDLLEXPORT wxComboBox: public wxChoice
   virtual long GetLastPosition(void) const ;
   virtual void Replace(long from, long to, const wxString& value);
   virtual void Remove(long from, long to);
+  virtual void SetSelection(int n)
+  {
+    wxChoice::SetSelection(n);
+  }
   virtual void SetSelection(long from, long to);
   virtual void SetEditable(bool editable);
 

samples/controls/controls.cpp

@@ -186,7 +186,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) :
   {
     "This",
     "is a",
-    "wonderfull",
+    "wonderful",
     "example.",
   };
   

src/msw/ole/dropsrc.cpp

@@ -228,7 +228,7 @@ wxDropSource::DragResult wxDropSource::DoDragDrop(bool bAllowMove)
 // Notes   : here we just leave this stuff for default implementation
 bool wxDropSource::GiveFeedback(DragResult effect, bool bScrolling)
 {
-  return false;
+  return FALSE;
 }
 
 #endif  //USE_DRAG_AND_DROP

utils/ogl/src/basic.cpp

@@ -2002,6 +2002,7 @@ void wxShape::ReadRegions(wxExpr *clause)
 
 void wxShape::Copy(wxShape& copy)
 {
+  copy.m_id = m_id;
   copy.m_xpos = m_xpos;
   copy.m_ypos = m_ypos;
   copy.m_pen = m_pen;