no message

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

diff --git a/utils/glcanvas/samples/cube/cube.dsp b/utils/glcanvas/samples/cube/cube.dsp
index 62459e2a9ca0d6916eb09fcaa0aaa4872313cde6..6d0d2dea80ea090244760d6608955fe7476c5d5f 100644 (file)
--- a/utils/glcanvas/samples/cube/cube.dsp
+++ b/utils/glcanvas/samples/cube/cube.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\include" /I "..\..\..\..\include\wx\msw" /I "..\..\..\..\include\wx\generic" /I "..\..\..\..\include\wx\other" /I "..\..\..\..\src\png" /I "..\..\..\..\src\zlib" /I "..\..\win" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D "__WINDOWS__" /D "STRICT" /YX"wx\wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\include" /I "..\..\..\..\include\wx\msw" /I "..\..\..\..\include\wx\generic" /I "..\..\..\..\include\wx\other" /I "..\..\..\..\src\png" /I "..\..\..\..\src\zlib" /I "..\..\win" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D "__WINDOWS__" /D "STRICT" /Fp"..\..\..\..\Release\wxWin.pch" /YX"wx\wxprec.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"
@@ -88,6 +88,14 @@ LINK32=link.exe
 # Name "cube - Win32 Debug"
 # Begin Source File
 
+SOURCE=.\wx\msw\blank.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\wx\msw\bullseye.cur
+# End Source File
+# Begin Source File
+
 SOURCE=.\cube.cpp
 # End Source File
 # Begin Source File
@@ -97,19 +105,56 @@ SOURCE=.\cube.h
 # Begin Source File
 
 SOURCE=.\cube.rc
-
-!IF  "$(CFG)" == "cube - Win32 Release"
-
 # ADD BASE RSC /l 0xc09
 # ADD RSC /l 0xc09 /i "..\..\..\..\include"
+# End Source File
+# Begin Source File
 
-!ELSEIF  "$(CFG)" == "cube - Win32 Debug"
+SOURCE=.\wx\msw\hand.cur
+# End Source File
+# Begin Source File
 
-# ADD BASE RSC /l 0xc09
-# ADD RSC /l 0xc09 /i "..\..\..\..\include"
+SOURCE=.\wx\msw\magnif1.cur
+# End Source File
+# Begin Source File
 
-!ENDIF 
+SOURCE=.\mondrian.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\wx\msw\noentry.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\wx\msw\pbrush.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\wx\msw\pencil.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\wx\msw\pntleft.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\wx\msw\pntright.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\wx\msw\query.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\wx\msw\roller.cur
+# End Source File
+# Begin Source File
+
+SOURCE=.\wx\msw\size.cur
+# End Source File
+# Begin Source File
 
+SOURCE=.\wx\msw\watch1.cur
 # End Source File
 # End Target
 # End Project

diff --git a/utils/glcanvas/samples/isosurf/isosurf.dsp b/utils/glcanvas/samples/isosurf/isosurf.dsp
index f5ae3a7466a765514e5f269f8ecd50348f4e9afe..11d5a003bd95da2bd0eeaaea0cc50a0eb5e20cf3 100644 (file)
--- a/utils/glcanvas/samples/isosurf/isosurf.dsp
+++ b/utils/glcanvas/samples/isosurf/isosurf.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\include" /I "..\..\..\..\include\wx\msw" /I "..\..\..\..\include\wx\generic" /I "..\..\..\..\include\wx\other" /I "..\..\..\..\src\png" /I "..\..\..\..\src\zlib" /I "..\..\win" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D "__WINDOWS__" /D "STRICT" /YX"wx\wxprec.h" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\include" /I "..\..\..\..\include\wx\msw" /I "..\..\..\..\include\wx\generic" /I "..\..\..\..\include\wx\other" /I "..\..\..\..\src\png" /I "..\..\..\..\src\zlib" /I "..\..\win" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D "__WINDOWS__" /D "STRICT" /Fp"..\..\..\..\Release\wxWin.pch" /YX"wx\wxprec.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"

diff --git a/utils/wxtree/src/wxtree.cpp b/utils/wxtree/src/wxtree.cpp
index 70d3be26c030ed789e4ec11a6798a373cc56fc74..aed1afafed8b6921e470c9ed39d708bca1f66908 100644 (file)
--- a/utils/wxtree/src/wxtree.cpp
+++ b/utils/wxtree/src/wxtree.cpp
@@ -317,7 +317,7 @@ void wxStoredTree::GetChildren(long id, wxList& list)
   }
 }
 
-wxStoredNode* wxStoredTree::GetNode(long id) const
+wxStoredNode* wxStoredTree::GetNode(long idx) const
 {
     wxASSERT(idx < m_num);