Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for compilation without wxUSE_TOOLTIPS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-06 23:28:53 +00:00
parent 462e243784
commit cb1a1dc963
3 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/window.h
View File

@@ -262,6 +262,7 @@ public:
wxDropTarget *GetDropTarget() const { return m_pDropTarget; } wxDropTarget *GetDropTarget() const { return m_pDropTarget; }
#endif #endif
#if wxUSE_TOOLTIPS
// tooltips // tooltips
// create a tooltip with this text // create a tooltip with this text
void SetToolTip(const wxString &tip); void SetToolTip(const wxString &tip);
@@ -269,6 +270,7 @@ public:
void SetToolTip(wxToolTip *tooltip); void SetToolTip(wxToolTip *tooltip);
// get the current tooltip (may return NULL if none) // get the current tooltip (may return NULL if none)
wxToolTip* GetToolTip() const { return m_tooltip; } wxToolTip* GetToolTip() const { return m_tooltip; }
#endif // wxUSE_TOOLTIPS
// Accept files for dragging // Accept files for dragging
virtual void DragAcceptFiles(bool accept); virtual void DragAcceptFiles(bool accept);
@@ -761,7 +763,9 @@ private:
void Init(); void Init();
// the associated tooltip (may be NULL if none) // the associated tooltip (may be NULL if none)
#if wxUSE_TOOLTIPS
wxToolTip *m_tooltip; wxToolTip *m_tooltip;
#endif
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

4
src/msw/tooltip.cpp
View File

@@ -27,6 +27,8 @@
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h" #include "wx/tooltip.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
@@ -196,3 +198,5 @@ void wxToolTip::SetTip(const wxString& tip)
(void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, 0, &ti); (void)SendTooltipMessage(GetToolTipCtrl(), TTM_UPDATETIPTEXT, 0, &ti);
} }
} }
#endif // wxUSE_TOOLTIPS

10
src/msw/window.cpp
View File

@@ -189,6 +189,7 @@ bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam),
WXLPARAM* WXUNUSED(result)) WXLPARAM* WXUNUSED(result))
{ {
#ifdef __WIN95__ #ifdef __WIN95__
#if wxUSE_TOOLTIPS
NMHDR* hdr = (NMHDR *)lParam; NMHDR* hdr = (NMHDR *)lParam;
if ( hdr->code == TTN_NEEDTEXT && m_tooltip ) if ( hdr->code == TTN_NEEDTEXT && m_tooltip )
{ {
@@ -198,6 +199,7 @@ bool wxWindow::MSWNotify(WXWPARAM WXUNUSED(wParam),
// processed // processed
return TRUE; return TRUE;
} }
#endif
#endif #endif
return FALSE; return FALSE;
@@ -287,7 +289,9 @@ void wxWindow::Init()
m_pDropTarget = NULL; m_pDropTarget = NULL;
#endif #endif
#if wxUSE_TOOLTIPS
m_tooltip = NULL; m_tooltip = NULL;
#endif
} }
wxWindow::wxWindow() wxWindow::wxWindow()
@@ -302,7 +306,9 @@ wxWindow::~wxWindow()
// first of all, delete the things on which nothing else depends // first of all, delete the things on which nothing else depends
#if wxUSE_TOOLTIPS
wxDELETE(m_tooltip); wxDELETE(m_tooltip);
#endif
// JACS - if behaviour is odd, restore this // JACS - if behaviour is odd, restore this
// to the start of ~wxWindow. Vadim has changed // to the start of ~wxWindow. Vadim has changed
@@ -542,6 +548,8 @@ void wxWindow::DragAcceptFiles(bool accept)
// tooltips // tooltips
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if wxUSE_TOOLTIPS
void wxWindow::SetToolTip(const wxString &tip) void wxWindow::SetToolTip(const wxString &tip)
{ {
SetToolTip(new wxToolTip(tip)); SetToolTip(new wxToolTip(tip));
@@ -556,6 +564,8 @@ void wxWindow::SetToolTip(wxToolTip *tooltip)
m_tooltip->SetWindow(this); m_tooltip->SetWindow(this);
} }
#endif // wxUSE_TOOLTIPS
// Get total size // Get total size
void wxWindow::GetSize(int *x, int *y) const void wxWindow::GetSize(int *x, int *y) const
{ {