projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rework the GTK WebKit backend history to remove the need for the map between wxWebHis...
[wxWidgets.git]
/
src
/
generic
/
tipwin.cpp
diff --git
a/src/generic/tipwin.cpp
b/src/generic/tipwin.cpp
index 2eba71e722e5e435df940848d240cfcd0f96fcb9..dfc01cff0d88fbf290807951018c188592f49e75 100644
(file)
--- a/
src/generic/tipwin.cpp
+++ b/
src/generic/tipwin.cpp
@@
-17,25
+17,22
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-// For compilers that support precompilati
x
on, includes "wx/wx.h".
+// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
+#if wxUSE_TIPWINDOW
+
+#include "wx/tipwin.h"
+
#ifndef WX_PRECOMP
#include "wx/dcclient.h"
#ifndef WX_PRECOMP
#include "wx/dcclient.h"
+ #include "wx/timer.h"
+ #include "wx/settings.h"
#endif // WX_PRECOMP
#endif // WX_PRECOMP
-#ifdef __WXGTK__
- #include <gtk/gtk.h>
-#endif
-#include "wx/tipwin.h"
-
-#if wxUSE_TIPWINDOW
-
-#include "wx/timer.h"
-#include "wx/settings.h"
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// constants
@@
-74,7
+71,7
@@
private:
#endif // !wxUSE_POPUPWIN
DECLARE_EVENT_TABLE()
#endif // !wxUSE_POPUPWIN
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxTipWindowView)
+ wxDECLARE_NO_COPY_CLASS(wxTipWindowView);
};
// ============================================================================
};
// ============================================================================
@@
-156,8
+153,7
@@
wxTipWindow::wxTipWindow(wxWindow *parent,
Position(wxPoint(x, y), wxSize(0,0));
Popup(m_view);
#ifdef __WXGTK__
Position(wxPoint(x, y), wxSize(0,0));
Popup(m_view);
#ifdef __WXGTK__
- if (!GTK_WIDGET_HAS_GRAB(m_widget))
- gtk_grab_add( m_widget );
+ m_view->CaptureMouse();
#endif
#else
Move(x, y);
#endif
#else
Move(x, y);
@@
-173,8
+169,8
@@
wxTipWindow::~wxTipWindow()
}
#ifdef wxUSE_POPUPWIN
#ifdef __WXGTK__
}
#ifdef wxUSE_POPUPWIN
#ifdef __WXGTK__
- if (
GTK_WIDGET_HAS_GRAB(m_widget)
)
-
gtk_grab_remove( m_widget
);
+ if (
m_view->HasCapture()
)
+
m_view->ReleaseMouse(
);
#endif
#endif
}
#endif
#endif
}
@@
-227,8
+223,8
@@
void wxTipWindow::Close()
#if wxUSE_POPUPWIN
Show(false);
#ifdef __WXGTK__
#if wxUSE_POPUPWIN
Show(false);
#ifdef __WXGTK__
- if (
GTK_WIDGET_HAS_GRAB(m_widget)
)
-
gtk_grab_remove( m_widget
);
+ if (
m_view->HasCapture()
)
+
m_view->ReleaseMouse(
);
#endif
Destroy();
#else
#endif
Destroy();
#else
@@
-271,7
+267,7
@@
void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
bool breakLine = false;
for ( const wxChar *p = text.c_str(); ; p++ )
{
bool breakLine = false;
for ( const wxChar *p = text.c_str(); ; p++ )
{
- if ( *p ==
_T('\n') || *p == _
T('\0') )
+ if ( *p ==
wxT('\n') || *p == wx
T('\0') )
{
dc.GetTextExtent(current, &width, &height);
if ( width > widthMax )
{
dc.GetTextExtent(current, &width, &height);
if ( width > widthMax )
@@
-291,7
+287,7
@@
void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
current.clear();
breakLine = false;
}
current.clear();
breakLine = false;
}
- else if ( breakLine && (*p ==
_T(' ') || *p == _
T('\t')) )
+ else if ( breakLine && (*p ==
wxT(' ') || *p == wx
T('\t')) )
{
// word boundary - break the line here
m_parent->m_textLines.Add(current);
{
// word boundary - break the line here
m_parent->m_textLines.Add(current);
@@
-315,7
+311,7
@@
void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
// take into account the border size and the margins
width = 2*(TEXT_MARGIN_X + 1) + widthMax;
// take into account the border size and the margins
width = 2*(TEXT_MARGIN_X + 1) + widthMax;
- height = 2*(TEXT_MARGIN_Y + 1) +
m_parent->m_textLines.GetCount(
)*m_parent->m_heightLine;
+ height = 2*(TEXT_MARGIN_Y + 1) +
wx_truncate_cast(wxCoord, m_parent->m_textLines.GetCount()
)*m_parent->m_heightLine;
m_parent->SetClientSize(width, height);
SetSize(0, 0, width, height);
}
m_parent->SetClientSize(width, height);
SetSize(0, 0, width, height);
}
@@
-330,8
+326,8
@@
void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event))
rect.height = size.y;
// first filll the background
rect.height = size.y;
// first filll the background
- dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
- dc.SetPen(
wxPen(GetForegroundColour(), 1, wxSOLID)
);
+ dc.SetBrush(wxBrush(GetBackgroundColour(), wx
BRUSHSTYLE_
SOLID));
+ dc.SetPen(
wxPen(GetForegroundColour(), 1, wxPENSTYLE_SOLID)
);
dc.DrawRectangle(rect);
// and then draw the text line by line
dc.DrawRectangle(rect);
// and then draw the text line by line
@@
-361,7
+357,7
@@
void wxTipWindowView::OnMouseMove(wxMouseEvent& event)
const wxRect& rectBound = m_parent->m_rectBound;
if ( rectBound.width &&
const wxRect& rectBound = m_parent->m_rectBound;
if ( rectBound.width &&
- !rectBound.
Inside
(ClientToScreen(event.GetPosition())) )
+ !rectBound.
Contains
(ClientToScreen(event.GetPosition())) )
{
// mouse left the bounding rect, disappear
m_parent->Close();
{
// mouse left the bounding rect, disappear
m_parent->Close();