Fixed GetIcon to keep up with return type change on all other platforms.

[wxWidgets.git] / src / generic / tipwin.cpp

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index c001b072f3e10f5ce2046c60def81ae670dc1614..9749b8a785c3b4eda3cf99910e8296a978e6d1d9 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "tipwin.h"
-#endif
-

 // For compilers that support precompilatixon, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilatixon, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -157,7 +153,7 @@ wxTipWindow::wxTipWindow(wxWindow *parent,
     y += wxSystemSettings::GetMetric(wxSYS_CURSOR_Y) / 2;
 
 #if wxUSE_POPUPWIN
     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))
     Popup(m_view);
     #ifdef __WXGTK__
         if (!GTK_WIDGET_HAS_GRAB(m_widget))


@@ -319,7 +315,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);
 }