Small fixes

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

diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp
index 4f1f87722945302c5a88c211dba9abd831b907ea..708382c8f71765610c87d9d02aa995809dd9ec81 100644 (file)
--- 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 44fb89cab9d5e9668540d9d0a514903679b078c9..e9e6035d5cfc3e6d288669fae31c84c3be7b0f44 100644 (file)
--- 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 a11165c1e24ce8a0e8d9080d57f8efe6816b927e..5af8da209b1b70fe970e3cfa10e2b5eb7bdaf1f7 100644 (file)
--- 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 4f098c93e8fc266fed676d26e2c20fe6a0b2f6c4..7172ee5960de424f07b231e3652fcb1fa6778378 100644 (file)
--- 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 e9dd3f758ce95e9d0836d668085a758dd9906cda..fdebc76c487f9ed9a60d4acc81baa692c4393591 100644 (file)
--- 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 3f805cc9fe6121854d20f35c1a7f98461f0fd957..663f1b4c9591a165d30548c71b6bde05ecc996b0 100644 (file)
--- 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 5a293e2cc6505720136e4860a1a358553908e4f5..83d00f3aeb4c1959cbc415657149d711cf6f0ade 100644 (file)
--- 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 12867bd404be03aea0f80a4a2607327a68409a43..d794ddd6752a072b9423dcbfef7c6160d07383e0 100644 (file)
--- 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;