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

Streamline wxPropertyGrid tooltip code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2010-09-23 12:58:02 +00:00
parent 614a87dffe
commit c27615f55c
3 changed files with 2 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/propgrid/propgrid.h
View File

@@ -1751,9 +1751,6 @@ public:
virtual void Refresh( bool eraseBackground = true, virtual void Refresh( bool eraseBackground = true,
const wxRect *rect = (const wxRect *) NULL ); const wxRect *rect = (const wxRect *) NULL );
virtual bool SetFont( const wxFont& font ); virtual bool SetFont( const wxFont& font );
#if wxPG_SUPPORT_TOOLTIPS
void SetToolTip( const wxString& tipString );
#endif
virtual void Freeze(); virtual void Freeze();
virtual void SetExtraStyle( long exStyle ); virtual void SetExtraStyle( long exStyle );
virtual void Thaw(); virtual void Thaw();

12
include/wx/propgrid/propgriddefs.h
View File

@@ -55,9 +55,6 @@
// 1 if splitter drag detect margin and control cannot overlap // 1 if splitter drag detect margin and control cannot overlap
#define wxPG_NO_CHILD_EVT_MOTION 0 #define wxPG_NO_CHILD_EVT_MOTION 0
// If 1, then setting empty tooltip actually hides it
#define wxPG_ALLOW_EMPTY_TOOLTIPS 1
#define wxPG_NAT_BUTTON_BORDER_ANY 1 #define wxPG_NAT_BUTTON_BORDER_ANY 1
#define wxPG_NAT_BUTTON_BORDER_X 1 #define wxPG_NAT_BUTTON_BORDER_X 1
#define wxPG_NAT_BUTTON_BORDER_Y 1 #define wxPG_NAT_BUTTON_BORDER_Y 1
@@ -94,9 +91,6 @@
// 1 if splitter drag detect margin and control cannot overlap // 1 if splitter drag detect margin and control cannot overlap
#define wxPG_NO_CHILD_EVT_MOTION 1 #define wxPG_NO_CHILD_EVT_MOTION 1
// If 1, then setting empty tooltip actually hides it
#define wxPG_ALLOW_EMPTY_TOOLTIPS 0
#define wxPG_NAT_BUTTON_BORDER_ANY 1 #define wxPG_NAT_BUTTON_BORDER_ANY 1
#define wxPG_NAT_BUTTON_BORDER_X 1 #define wxPG_NAT_BUTTON_BORDER_X 1
#define wxPG_NAT_BUTTON_BORDER_Y 1 #define wxPG_NAT_BUTTON_BORDER_Y 1
@@ -131,9 +125,6 @@
// 1 if splitter drag detect margin and control cannot overlap // 1 if splitter drag detect margin and control cannot overlap
#define wxPG_NO_CHILD_EVT_MOTION 0 #define wxPG_NO_CHILD_EVT_MOTION 0
// If 1, then setting empty tooltip actually hides it
#define wxPG_ALLOW_EMPTY_TOOLTIPS 1
#define wxPG_NAT_BUTTON_BORDER_ANY 0 #define wxPG_NAT_BUTTON_BORDER_ANY 0
#define wxPG_NAT_BUTTON_BORDER_X 0 #define wxPG_NAT_BUTTON_BORDER_X 0
#define wxPG_NAT_BUTTON_BORDER_Y 0 #define wxPG_NAT_BUTTON_BORDER_Y 0
@@ -168,9 +159,6 @@
// 1 if splitter drag detect margin and control cannot overlap // 1 if splitter drag detect margin and control cannot overlap
#define wxPG_NO_CHILD_EVT_MOTION 1 #define wxPG_NO_CHILD_EVT_MOTION 1
// If 1, then setting empty tooltip actually hides it
#define wxPG_ALLOW_EMPTY_TOOLTIPS 0
#define wxPG_NAT_BUTTON_BORDER_ANY 0 #define wxPG_NAT_BUTTON_BORDER_ANY 0
#define wxPG_NAT_BUTTON_BORDER_X 0 #define wxPG_NAT_BUTTON_BORDER_X 0
#define wxPG_NAT_BUTTON_BORDER_Y 0 #define wxPG_NAT_BUTTON_BORDER_Y 0

44
src/propgrid/propgrid.cpp
View File

@@ -4922,28 +4922,6 @@ bool wxPropertyGrid::HandleMouseDoubleClick( int WXUNUSED(x),
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
#if wxPG_SUPPORT_TOOLTIPS
void wxPropertyGrid::SetToolTip( const wxString& tipString )
{
if ( tipString.length() )
{
wxScrolledWindow::SetToolTip(tipString);
}
else
{
#if wxPG_ALLOW_EMPTY_TOOLTIPS
wxScrolledWindow::SetToolTip( m_emptyString );
#else
wxScrolledWindow::SetToolTip( NULL );
#endif
}
}
#endif // #if wxPG_SUPPORT_TOOLTIPS
// -----------------------------------------------------------------------
// Return false if should be skipped // Return false if should be skipped
bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y, bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
wxMouseEvent &event ) wxMouseEvent &event )
@@ -5033,8 +5011,6 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
// //
if ( m_windowStyle & wxPG_TOOLTIPS ) if ( m_windowStyle & wxPG_TOOLTIPS )
{ {
wxToolTip* tooltip = GetToolTip();
if ( m_propHover != prevHover || prevSide != m_mouseSide ) if ( m_propHover != prevHover || prevSide != m_mouseSide )
{ {
if ( m_propHover && !m_propHover->IsCategory() ) if ( m_propHover && !m_propHover->IsCategory() )
@@ -5074,34 +5050,18 @@ bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
int tw, th; int tw, th;
GetTextExtent( tipString, &tw, &th, 0, 0 ); GetTextExtent( tipString, &tw, &th, 0, 0 );
if ( tw > space ) if ( tw > space )
{
SetToolTip( tipString ); SetToolTip( tipString );
}
} }
else else
{ {
if ( tooltip ) SetToolTip( m_emptyString );
{
#if wxPG_ALLOW_EMPTY_TOOLTIPS
SetToolTip( m_emptyString );
#else
wxScrolledWindow::SetToolTip( NULL );
#endif
}
} }
} }
} }
else else
{ {
if ( tooltip ) SetToolTip( m_emptyString );
{
#if wxPG_ALLOW_EMPTY_TOOLTIPS
SetToolTip( m_emptyString );
#else
wxScrolledWindow::SetToolTip( NULL );
#endif
}
} }
} }
} }