compilation fix after wxFont changes (closes #10152)

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

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 59deba50a4043b321c2e1b0c683faa100a17e1d6..daea96f6696f90d2c8df0bf9a412d3e1b18199e9 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -17,27 +17,22 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #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
 

-#ifndef WX_PRECOMP
-    #include "wx/dcclient.h"
-#endif // WX_PRECOMP
+#if wxUSE_TIPWINDOW

 
 #include "wx/tipwin.h"
 
 
 #include "wx/tipwin.h"
 

-#if wxUSE_TIPWINDOW
-
-#include "wx/timer.h"
-#include "wx/settings.h"
+#ifndef WX_PRECOMP
+    #include "wx/dcclient.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"
+#endif // WX_PRECOMP

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -124,7 +119,7 @@ wxTipWindow::wxTipWindow(wxWindow *parent,
 #if wxUSE_POPUPWIN
            : wxPopupTransientWindow(parent)
 #else
 #if wxUSE_POPUPWIN
            : wxPopupTransientWindow(parent)
 #else

-           : wxFrame(parent, -1, _T(""),
+           : wxFrame(parent, wxID_ANY, wxEmptyString,

                      wxDefaultPosition, wxDefaultSize,
                      wxNO_BORDER | wxFRAME_NO_TASKBAR )
 #endif
                      wxDefaultPosition, wxDefaultSize,
                      wxNO_BORDER | wxFRAME_NO_TASKBAR )
 #endif


@@ -155,11 +150,14 @@ 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);
     Popup(m_view);

+    #ifdef __WXGTK__
+        m_view->CaptureMouse();
+    #endif

 #else
     Move(x, y);
 #else
     Move(x, y);

-    Show(TRUE);
+    Show(true);

 #endif
 }
 
 #endif
 }
 


@@ -169,6 +167,12 @@ wxTipWindow::~wxTipWindow()
     {
         *m_windowPtr = NULL;
     }
     {
         *m_windowPtr = NULL;
     }

+    #ifdef wxUSE_POPUPWIN
+        #ifdef __WXGTK__
+            if ( m_view->HasCapture() )
+                m_view->ReleaseMouse();
+        #endif
+    #endif

 }
 
 void wxTipWindow::OnMouseClick(wxMouseEvent& WXUNUSED(event))
 }
 
 void wxTipWindow::OnMouseClick(wxMouseEvent& WXUNUSED(event))


@@ -217,7 +221,11 @@ void wxTipWindow::Close()
     }
 
 #if wxUSE_POPUPWIN
     }
 
 #if wxUSE_POPUPWIN

-    Show(FALSE);
+    Show(false);
+    #ifdef __WXGTK__
+        if ( m_view->HasCapture() )
+            m_view->ReleaseMouse();
+    #endif

     Destroy();
 #else
     wxFrame::Close();
     Destroy();
 #else
     wxFrame::Close();


@@ -229,7 +237,7 @@ void wxTipWindow::Close()
 // ----------------------------------------------------------------------------
 
 wxTipWindowView::wxTipWindowView(wxWindow *parent)
 // ----------------------------------------------------------------------------
 
 wxTipWindowView::wxTipWindowView(wxWindow *parent)

-               : wxWindow(parent, -1,
+               : wxWindow(parent, wxID_ANY,

                           wxDefaultPosition, wxDefaultSize,
                           wxNO_BORDER)
 {
                           wxDefaultPosition, wxDefaultSize,
                           wxNO_BORDER)
 {


@@ -256,7 +264,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
             widthMax = 0;
     m_parent->m_heightLine = 0;
 
             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') )
     for ( const wxChar *p = text.c_str(); ; p++ )
     {
         if ( *p == _T('\n') || *p == _T('\0') )


@@ -277,21 +285,21 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
             }
 
             current.clear();
             }
 
             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();
         }
         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 )
         }
         else // line goes on
         {
             current += *p;
             dc.GetTextExtent(current, &width, &height);
             if ( width > maxLength )

-                breakLine = TRUE;
+                breakLine = true;

 
             if ( width > widthMax )
                 widthMax = width;
 
             if ( width > widthMax )
                 widthMax = width;


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


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


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