Fixed wxRichTextCtrl caret test case

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

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index c001b072f3e10f5ce2046c60def81ae670dc1614..b50fb47a9647790dc36e8a521bb159da1e5943fc 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -17,29 +17,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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
 
 #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


@@ -78,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);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -157,11 +150,10 @@ 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__
     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);


@@ -175,10 +167,10 @@ wxTipWindow::~wxTipWindow()
     {
         *m_windowPtr = NULL;
     }
     {
         *m_windowPtr = NULL;
     }

-    #ifdef wxUSE_POPUPWIN
+    #if wxUSE_POPUPWIN

         #ifdef __WXGTK__
         #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
 }


@@ -231,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


@@ -275,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 == wxT('\0') )

         {
             dc.GetTextExtent(current, &width, &height);
             if ( width > widthMax )
         {
             dc.GetTextExtent(current, &width, &height);
             if ( width > widthMax )


@@ -295,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 == wxT('\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);


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


@@ -334,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(), wxBRUSHSTYLE_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


@@ -365,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();