Merge the changes from 3.0 branch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-12 18:06:37 +00:00
parent e4d0bc4bb1
commit 9b31387508
100 changed files with 7289 additions and 1390 deletions
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -2058,7 +2058,7 @@ void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
 #endif
                    , s_windowFocus->GetName().c_str()
 #ifdef __WXMSW__
-                    , (unsigned int) s_windowFocus->GetHWND()
+                    , (unsigned)wxPtrToUInt(s_windowFocus->GetHWND())
 #endif
                      );
        }