Initial check in of wxApplet code to CVS

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

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index f712aed83f07e4a0ae244c84c305fe8e6d6cd035..9937d350374c162bd0056801c4f4d8bd4c69cc13 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -127,7 +127,7 @@ wxTipWindow::~wxTipWindow()
     }
 }
 
     }
 }
 

-void wxTipWindow::OnMouseClick(wxMouseEvent& event)
+void wxTipWindow::OnMouseClick(wxMouseEvent& WXUNUSED(event))

 {
     Close();
 }
 {
     Close();
 }


@@ -138,9 +138,14 @@ void wxTipWindow::OnActivate(wxActivateEvent& event)
         Close();
 }
 
         Close();
 }
 

-void wxTipWindow::OnKillFocus(wxFocusEvent& event)
+void wxTipWindow::OnKillFocus(wxFocusEvent& WXUNUSED(event))

 {
 {

+    // Under Windows at least, we will get this immediately
+    // because when the view window is focussed, the
+    // tip window goes out of focus.
+#ifdef __WXGTK__

     Close();
     Close();

+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -226,7 +231,7 @@ void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
                   2*(TEXT_MARGIN_Y + 1) + parent->m_textLines.GetCount()*parent->m_heightLine);
 }
 
                   2*(TEXT_MARGIN_Y + 1) + parent->m_textLines.GetCount()*parent->m_heightLine);
 }
 

-void wxTipWindowView::OnPaint(wxPaintEvent& event)
+void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event))

 {
     wxTipWindow* parent = (wxTipWindow*) GetParent();
     if (!parent)
 {
     wxTipWindow* parent = (wxTipWindow*) GetParent();
     if (!parent)


@@ -265,14 +270,15 @@ void wxTipWindowView::OnPaint(wxPaintEvent& event)
     }
 }
 
     }
 }
 

-void wxTipWindowView::OnMouseClick(wxMouseEvent& event)
+void wxTipWindowView::OnMouseClick(wxMouseEvent& WXUNUSED(event))

 {
     GetParent()->Close();
 }
 
 {
     GetParent()->Close();
 }
 

-void wxTipWindowView::OnKillFocus(wxFocusEvent& event)
+void wxTipWindowView::OnKillFocus(wxFocusEvent& WXUNUSED(event))

 {
     // Workaround the kill focus event happening just after creation in wxGTK
     if (wxGetLocalTime() > m_creationTime + 1)
         GetParent()->Close();
 }
 {
     // Workaround the kill focus event happening just after creation in wxGTK
     if (wxGetLocalTime() > m_creationTime + 1)
         GetParent()->Close();
 }

+