// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "tipwin.h"
-#endif
-
-// For compilers that support precompilatixon, includes "wx/wx.h".
+// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
+#if wxUSE_TIPWINDOW
+
+#include "wx/tipwin.h"
+
#ifndef WX_PRECOMP
#include "wx/dcclient.h"
+ #include "wx/timer.h"
+ #include "wx/settings.h"
#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
#endif // !wxUSE_POPUPWIN
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxTipWindowView)
+ wxDECLARE_NO_COPY_CLASS(wxTipWindowView);
};
// ============================================================================
#if wxUSE_POPUPWIN
: wxPopupTransientWindow(parent)
#else
- : wxFrame(parent, -1, _T(""),
+ : wxFrame(parent, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize,
wxNO_BORDER | wxFRAME_NO_TASKBAR )
#endif
y += wxSystemSettings::GetMetric(wxSYS_CURSOR_Y) / 2;
#if wxUSE_POPUPWIN
- Position(wxPoint(x, y), wxSize(0, 0));
+ Position(wxPoint(x, y), wxSize(0,0));
Popup(m_view);
#ifdef __WXGTK__
- if (!GTK_WIDGET_HAS_GRAB(m_widget))
- gtk_grab_add( m_widget );
- #endif
+ m_view->CaptureMouse();
+ #endif
#else
Move(x, y);
- Show(TRUE);
+ Show(true);
#endif
}
}
#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
}
}
#if wxUSE_POPUPWIN
- Show(FALSE);
+ Show(false);
#ifdef __WXGTK__
- if (GTK_WIDGET_HAS_GRAB(m_widget))
- gtk_grab_remove( m_widget );
- #endif
+ if ( m_view->HasCapture() )
+ m_view->ReleaseMouse();
+ #endif
Destroy();
#else
wxFrame::Close();
// ----------------------------------------------------------------------------
wxTipWindowView::wxTipWindowView(wxWindow *parent)
- : wxWindow(parent, -1,
+ : wxWindow(parent, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
wxNO_BORDER)
{
widthMax = 0;
m_parent->m_heightLine = 0;
- bool breakLine = FALSE;
+ bool breakLine = false;
for ( const wxChar *p = text.c_str(); ; p++ )
{
if ( *p == _T('\n') || *p == _T('\0') )
}
current.clear();
- breakLine = FALSE;
+ breakLine = false;
}
else if ( breakLine && (*p == _T(' ') || *p == _T('\t')) )
{
// word boundary - break the line here
m_parent->m_textLines.Add(current);
current.clear();
- breakLine = FALSE;
+ breakLine = false;
}
else // line goes on
{
current += *p;
dc.GetTextExtent(current, &width, &height);
if ( width > maxLength )
- breakLine = TRUE;
+ breakLine = true;
if ( width > widthMax )
widthMax = width;
// 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);
}
rect.height = size.y;
// first filll the background
- dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
- dc.SetPen( wxPen(GetForegroundColour(), 1, wxSOLID) );
+ dc.SetBrush(wxBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID));
+ dc.SetPen(wxPen(GetForegroundColour(), 1, wxPENSTYLE_SOLID));
dc.DrawRectangle(rect);
// and then draw the text line by line
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();