Small compile fixes

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

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 47717502908967d9f7a0e62b902e66604304a15c..5558f61ad84c0189cbd3784afd4f35e6fe047cd5 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -1,7 +1,5 @@
 src/wxvc.dsp
 src/wxvc.dsw
-src/wxvc6.dsp
-src/wxvc6.dsw
 src/wxvc_dll.dsp
 src/wxvc_dll.dsw
 

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 6370f30280dcb4c7183870884584d764a3c2619b..9df13cefdc279963dfbcb986878d57115a4646d3 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -397,6 +397,17 @@ Notes:
 
   (a missing bracket).
 
+- If there's a problem with the copy command in
+  src/msw/makefile.g95, you may need to change the relevant
+  section to the following:
+
+  COPY = command /c copy
+  $(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
+      $(COPY) ..\\common\\dosyacc.c ..\\common\\y_tab.c
+
+  $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
+      $(COPY) ..\\common\\doslex.c ..\\common\\lex_yy.c
+
 References:
 
  - The GNU-WIN32 site is at

diff --git a/src/generic/tabg.cpp b/src/generic/tabg.cpp
index 2ac60d8afd0605fe5503c73a0e15b76e9da686d6..24fb5c5f1c1c2b8652307ee3a00bfb86cf402b51 100644 (file)
--- a/src/generic/tabg.cpp
+++ b/src/generic/tabg.cpp
@@ -699,6 +699,7 @@ void wxTabView::ClearTabs(bool deleteTabs)
     layerNode = nextLayerNode;
   }
   m_noTabs = 0;
+  m_tabSelection = -1;
 }
 
 
@@ -1024,6 +1025,9 @@ void wxTabView::SetBackgroundColour(const wxColour& col)
 
 void wxTabView::SetTabSelection(int sel, bool activateTool)
 {
+  if ( sel==m_tabSelection )
+    return;
+
   int oldSel = m_tabSelection;
   wxTabControl *control = FindTabControlForId(sel);
   wxTabControl *oldControl = FindTabControlForId(m_tabSelection);

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 3b9306f74233cdd5d28e4348920907a2068f0bcc..492023bdd27620070ae83e5691ed9a18e9535280 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -1001,7 +1001,7 @@ bool wxFileDataObject::GetDataHere(void *pData) const
 #endif // Unicode/Ansi
 
     // set start of filenames list (null separated)
-    wxChar *pbuf = (BYTE *)pDrop + sizeof(DROPFILES);
+    wxChar *pbuf = (wxChar*) ((BYTE *)pDrop + sizeof(DROPFILES));
 
     size_t count = m_filenames.GetCount();
     for (size_t i = 0; i < count; i++ )