added missing return on error

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

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index 570d632273eddb80e976f623ea613cf3cfd2e293..1469b554c77918cd8541da0c5c400fdd6db516bc 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -99,12 +99,7 @@ wxTipWindow::wxTipWindow(wxWindow *parent,
 {
     // set colours
     SetForegroundColour(*wxBLACK);
 {
     // set colours
     SetForegroundColour(*wxBLACK);

-#if !defined(__WXPM__)
-    SetBackgroundColour(wxColour(0xc3ffff));
-#else
-    // What is 0xc3ffff, try some legable documentation for those of us who don't memorize hex codes??
-    SetBackgroundColour(wxColour(*wxWHITE));
-#endif
+    SetBackgroundColour(wxColour(255, 255, 231));

     // set position and size
     int x, y;
     wxGetMousePosition(&x, &y);
     // set position and size
     int x, y;
     wxGetMousePosition(&x, &y);


@@ -127,7 +122,7 @@ wxTipWindow::~wxTipWindow()
     }
 }
 
     }
 }
 

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

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


@@ -138,7 +133,7 @@ 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
 {
     // Under Windows at least, we will get this immediately
     // because when the view window is focussed, the


@@ -159,12 +154,7 @@ wxTipWindowView::wxTipWindowView(wxWindow *parent)
 {
     // set colours
     SetForegroundColour(*wxBLACK);
 {
     // set colours
     SetForegroundColour(*wxBLACK);

-#if !defined(__WXPM__)
-    SetBackgroundColour(wxColour(0xc3ffff));
-#else
-    // What is 0xc3ffff, try some legable documentation for those of us who don't memorize hex codes??
-    SetBackgroundColour(wxColour(*wxWHITE));
-#endif
+    SetBackgroundColour(wxColour(255, 255, 231));

     m_creationTime = wxGetLocalTime();
 }
 
     m_creationTime = wxGetLocalTime();
 }
 


@@ -231,7 +221,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)


@@ -270,14 +260,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();
 }

+