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
This commit is contained in:
Włodzimierz Skiba
2006-07-24 14:04:31 +00:00
parent 60decce547
commit 623d5f8002
3 changed files with 22 additions and 16 deletions

View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: msw/tooltip.h // Name: wx/msw/tooltip.h
// Purpose: wxToolTip class - tooltip control // Purpose: wxToolTip class - tooltip control
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@@ -14,6 +14,8 @@
#include "wx/object.h" #include "wx/object.h"
class WXDLLIMPEXP_CORE wxWindow;
class WXDLLEXPORT wxToolTip : public wxObject class WXDLLEXPORT wxToolTip : public wxObject
{ {
public: public:

View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: msw/spinctrl.cpp // Name: src/msw/spinctrl.cpp
// Purpose: wxSpinCtrl class implementation for Win32 // Purpose: wxSpinCtrl class implementation for Win32
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@@ -24,13 +24,15 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#if wxUSE_SPINCTRL #if wxUSE_SPINCTRL
#include "wx/spinctrl.h" #include "wx/spinctrl.h"
#ifndef WX_PRECOMP
#include "wx/event.h"
#include "wx/textctrl.h"
#endif
#include "wx/msw/private.h" #include "wx/msw/private.h"
#include "wx/msw/wrapcctl.h" #include "wx/msw/wrapcctl.h"
@@ -443,7 +445,7 @@ void wxSpinCtrl::SetValue(int val)
// text control is currently empty, the spin button seems to be happy // 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 // to leave it like this, while we really want to always show the
// current value in the control, so do it manually // 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 #endif // wxUSE_SPINCTRL

View File

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