From e8435fa381a3479dc5fe8c3d56d8e58b53568599 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 4 Aug 1998 07:24:05 +0000
Subject: [PATCH] Small fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/msw.rsp           |  1 +
 docs/licence.txt              |  2 +-
 docs/msw/changes.txt          | 13 +++++++++++++
 docs/msw/todo.txt             |  1 +
 include/wx/msw/combobox.h     |  4 ++++
 samples/controls/controls.cpp |  2 +-
 src/msw/ole/dropsrc.cpp       |  2 +-
 utils/ogl/src/basic.cpp       |  1 +
 8 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp
index 4f1f877229..708382c8f7 100644
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -1,4 +1,5 @@
 docs/msw/*.txt
+docs/licence.txt
 
 src/makeb32.env
 src/makebcc.env
diff --git a/docs/licence.txt b/docs/licence.txt
index 44fb89cab9..e9e6035d5c 100644
--- a/docs/licence.txt
+++ b/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
diff --git a/docs/msw/changes.txt b/docs/msw/changes.txt
index a11165c1e2..5af8da209b 100644
--- a/docs/msw/changes.txt
+++ b/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
 -----------------------
 
diff --git a/docs/msw/todo.txt b/docs/msw/todo.txt
index 4f098c93e8..7172ee5960 100644
--- a/docs/msw/todo.txt
+++ b/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
diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index e9dd3f758c..fdebc76c48 100644
--- a/include/wx/msw/combobox.h
+++ b/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);
 
diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 3f805cc9fe..663f1b4c95 100644
--- a/samples/controls/controls.cpp
+++ b/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.",
   };
   
diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp
index 5a293e2cc6..83d00f3aeb 100644
--- a/src/msw/ole/dropsrc.cpp
+++ b/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
\ No newline at end of file
diff --git a/utils/ogl/src/basic.cpp b/utils/ogl/src/basic.cpp
index 12867bd404..d794ddd675 100644
--- a/utils/ogl/src/basic.cpp
+++ b/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;