Forgot to take the unneeded code out

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index a902a891c78b657bb5102ccaa492bcb246d1a4e9..fc18fbff7bf706f9f71985348f697fdcc04ca8b0 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -59,35 +59,6 @@ BEGIN_EVENT_TABLE(wxTipWindow, wxPopupTransientWindow)
 END_EVENT_TABLE()
 
 
-#if 0
-// Viewer window to put in the frame
-class wxTipWindowView: public wxWindow
-{
-public:
-    wxTipWindowView(wxWindow *parent);
-
-    // event handlers
-    void OnPaint(wxPaintEvent& event);
-    void OnMouseClick(wxMouseEvent& event);
-    void OnKillFocus(wxFocusEvent& event);
-
-    // calculate the client rect we need to display the text
-    void Adjust(const wxString& text, wxCoord maxLength);
-
-    long m_creationTime;
-
-  DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxTipWindowView, wxWindow)
-    EVT_PAINT(wxTipWindowView::OnPaint)
-    EVT_LEFT_DOWN(wxTipWindowView::OnMouseClick)
-    EVT_RIGHT_DOWN(wxTipWindowView::OnMouseClick)
-    EVT_MIDDLE_DOWN(wxTipWindowView::OnMouseClick)
-    EVT_KILL_FOCUS(wxTipWindowView::OnKillFocus)
-END_EVENT_TABLE()
-#endif
-
 // ----------------------------------------------------------------------------
 // wxTipWindow
 // ----------------------------------------------------------------------------
@@ -235,133 +206,3 @@ void wxTipWindow::Close()
 }
 
 
-// ----------------------------------------------------------------------------
-// wxTipWindowView
-// ----------------------------------------------------------------------------
-#if 0
-wxTipWindowView::wxTipWindowView(wxWindow *parent)
-           : wxWindow(parent, -1,
-                     wxDefaultPosition, wxDefaultSize,
-                     wxNO_BORDER)
-{
-    // set colours
-    SetForegroundColour(*wxBLACK);
-#ifdef __WXMSW__
-    wxColour bkCol(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_INFOBK));
-#else
-    wxColour bkCol(wxColour(255, 255, 225));
-#endif
-    SetBackgroundColour(bkCol);
-    m_creationTime = wxGetLocalTime();
-}
-
-void wxTipWindowView::Adjust(const wxString& text, wxCoord maxLength)
-{
-    wxTipWindow* parent = (wxTipWindow*) GetParent();
-    wxClientDC dc(this);
-    dc.SetFont(GetFont());
-
-    // calculate the length: we want each line be no longer than maxLength
-    // pixels and we only break lines at words boundary
-    wxString current;
-    wxCoord height, width,
-            widthMax = 0;
-    parent->m_heightLine = 0;
-
-    bool breakLine = FALSE;
-    for ( const wxChar *p = text.c_str(); ; p++ )
-    {
-        if ( *p == _T('\n') || *p == _T('\0') )
-        {
-            dc.GetTextExtent(current, &width, &height);
-            if ( width > widthMax )
-                widthMax = width;
-
-            if ( height > parent->m_heightLine )
-                parent->m_heightLine = height;
-
-            parent->m_textLines.Add(current);
-
-            if ( !*p )
-            {
-                // end of text
-                break;
-            }
-
-            current.clear();
-            breakLine = FALSE;
-        }
-        else if ( breakLine && (*p == _T(' ') || *p == _T('\t')) )
-        {
-            // word boundary - break the line here
-            parent->m_textLines.Add(current);
-            current.clear();
-            breakLine = FALSE;
-        }
-        else // line goes on
-        {
-            current += *p;
-            dc.GetTextExtent(current, &width, &height);
-            if ( width > maxLength )
-                breakLine = TRUE;
-
-            if ( width > widthMax )
-                widthMax = width;
-
-            if ( height > parent->m_heightLine )
-                parent->m_heightLine = height;
-        }
-    }
-
-    // take into account the border size and the margins
-    GetParent()->SetClientSize(2*(TEXT_MARGIN_X + 1) + widthMax,
-                  2*(TEXT_MARGIN_Y + 1) + parent->m_textLines.GetCount()*parent->m_heightLine);
-}
-
-void wxTipWindowView::OnPaint(wxPaintEvent& WXUNUSED(event))
-{
-    wxTipWindow* parent = (wxTipWindow*) GetParent();
-    if (!parent)
-      return;
-
-    wxPaintDC dc(this);
-
-    wxRect rect;
-    wxSize size = GetClientSize();
-    rect.width = size.x;
-    rect.height = size.y;
-
-    // first filll the background
-    dc.SetBrush(wxBrush(GetBackgroundColour(), wxSOLID));
-
-    dc.SetPen( * wxBLACK_PEN );
-    dc.DrawRectangle(rect);
-
-    // and then draw the text line by line
-    dc.SetFont(GetFont());
-
-    wxPoint pt;
-    pt.x = TEXT_MARGIN_X;
-    pt.y = TEXT_MARGIN_Y;
-    size_t count = parent->m_textLines.GetCount();
-    for ( size_t n = 0; n < count; n++ )
-    {
-        dc.DrawText(parent->m_textLines[n], pt);
-
-        pt.y += parent->m_heightLine;
-    }
-}
-
-void wxTipWindowView::OnMouseClick(wxMouseEvent& WXUNUSED(event))
-{
-    GetParent()->Close();
-}
-
-void wxTipWindowView::OnKillFocus(wxFocusEvent& WXUNUSED(event))
-{
-    // Workaround the kill focus event happening just after creation in wxGTK
-    if (wxGetLocalTime() > m_creationTime + 1)
-        GetParent()->Close();
-}
-
-#endif