Warning fix, minor source cleaning and better !PCH support.

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

diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
index 667e6eec3e1e464816610e26ff39310d87c153e6..8a3aed18445fddcdff3fc6ff2cde7f8d6a39499c 100644 (file)
--- a/include/wx/msw/tooltip.h
+++ b/include/wx/msw/tooltip.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/tooltip.h
+// Name:        wx/msw/tooltip.h
 // Purpose:     wxToolTip class - tooltip control
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -14,6 +14,8 @@
 
 #include "wx/object.h"
 
+class WXDLLIMPEXP_CORE wxWindow;
+
 class WXDLLEXPORT wxToolTip : public wxObject
 {
 public:

diff --git a/src/msw/spinctrl.cpp b/src/msw/spinctrl.cpp
index da8bb856f66a7a26563ba0e154f380c038406415..a5eb22d430d558d8f3be91c604fbfb522986dd79 100644 (file)
--- a/src/msw/spinctrl.cpp
+++ b/src/msw/spinctrl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/spinctrl.cpp
+// Name:        src/msw/spinctrl.cpp
 // Purpose:     wxSpinCtrl class implementation for Win32
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -24,13 +24,15 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
 #if wxUSE_SPINCTRL
 
 #include "wx/spinctrl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/event.h"
+    #include "wx/textctrl.h"
+#endif
+
 #include "wx/msw/private.h"
 #include "wx/msw/wrapcctl.h"
 
@@ -266,7 +268,7 @@ void wxSpinCtrl::OnChar(wxKeyEvent& event)
 void wxSpinCtrl::OnKillFocus(wxFocusEvent& event)
 {
     // ensure that the value is shown correctly
-    SetValue(GetValue()) ; 
+    SetValue(GetValue()) ;
     event.Skip();
 }
 
@@ -443,7 +445,7 @@ void  wxSpinCtrl::SetValue(int val)
         // text control is currently empty, the spin button seems to be happy
         // to leave it like this, while we really want to always show the
         // current value in the control, so do it manually
-        ::SetWindowText(GetBuddyHwnd(), wxString::Format(_T("%ld"), val));
+        ::SetWindowText(GetBuddyHwnd(), wxString::Format(_T("%d"), val));
     }
 }
 
@@ -622,4 +624,3 @@ void wxSpinCtrl::DoGetPosition(int *x, int *y) const
 }
 
 #endif // wxUSE_SPINCTRL
-

diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp
index 8ca70b9ff363b3dc9f4cc3bf9b45d110a8d856bd..fe6f37ee05aaec29324809c2840ca44e4ee0197b 100644 (file)
--- a/src/msw/tooltip.cpp
+++ b/src/msw/tooltip.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/tooltip.cpp
+// Name:        src/msw/tooltip.cpp
 // Purpose:     wxToolTip class implementation for MSW
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -23,13 +23,16 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-    #include "wx/wx.h"
-#endif
-
 #if wxUSE_TOOLTIPS
 
 #include "wx/tooltip.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/control.h"
+    #include "wx/combobox.h"
+#endif
+
 #include "wx/msw/private.h"
 
 // include <commctrl.h> "properly"
@@ -246,8 +249,8 @@ wxToolTip::wxToolTip(const wxString &tip)
 wxToolTip::~wxToolTip()
 {
     // the tooltip has to be removed before deleting. Otherwise, if it is visible
-       // while being deleted, there will be a delay before it goes away.
-       Remove();
+    // while being deleted, there will be a delay before it goes away.
+    Remove();
 }
 
 // ----------------------------------------------------------------------------