← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

« back to all changes in this revision

Viewing changes to src/interface/StatusView.cpp

  • Committer: Package Import Robot
  • Author(s): Adrien Cunin
  • Date: 2012-12-07 17:17:17 UTC
  • mfrom: (1.1.31)
  • Revision ID: package-import@ubuntu.com-20121207171717-nt6as62u4pa1uv11
Tags: 3.6.0.2-1ubuntu1
* Merge from Debian experimental. Remaining Ubuntu change:
   - Added debian/patches/11_use-decimal-si-by-default.patch in order to
     comply with UnitsPolicy

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/interface/StatusView.cpp
31
31
        {
32
32
                DoSetSelection(from, to, false);
33
33
 
34
 
                m_updatesCount = -2;        // suppress any update event
 
34
                m_updatesCount = -2;            // suppress any update event
35
35
 
36
36
                ::SendMessage((HWND)GetHandle(), EM_REPLACESEL, 0, (LPARAM)_T(""));
37
37
        }
94
94
CStatusView::CStatusView(wxWindow* parent, wxWindowID id)
95
95
        : wxWindow(parent, id, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER)
96
96
{
97
 
        m_pTextCtrl = 0;
98
97
        m_pTextCtrl = new CFastTextCtrl(this);
99
98
 
100
99
#ifdef __WXMAC__
110
109
        InitDefAttr();
111
110
 
112
111
        m_shown = IsShown();
113
 
        
 
112
 
114
113
#ifdef __WXMAC__
115
114
        m_insertionPoint = 0;
116
115
#endif
172
171
#endif
173
172
                m_pTextCtrl->Remove(0, oldLength + 1);
174
173
                m_lineLengths.pop_front();
175
 
                
 
174
 
176
175
#ifdef __WXMAC__
177
176
                m_pTextCtrl->SetInsertionPoint(m_insertionPoint);
178
177
#endif
279
278
                timestampWidth = width;
280
279
        }
281
280
 
282
 
        int maxWidth = 0;
283
281
        wxCoord width = 0;
284
282
        wxCoord height = 0;
285
283
        dc.GetTextExtent(_("Error:"), &width, &height);
286
 
        maxWidth = width;
 
284
        int maxWidth = width;
287
285
        dc.GetTextExtent(_("Command:"), &width, &height);
288
286
        if (width > maxWidth)
289
287
                maxWidth = width;
392
390
                m_pTextCtrl->Clear();
393
391
        m_nLineCount = 0;
394
392
        m_lineLengths.clear();
395
 
        
 
393
 
396
394
#ifdef __WXMAC__
397
395
        m_insertionPoint = 0;
398
396
#endif
436
434
                        m_lineLengths.clear();
437
435
                }
438
436
 
439
 
                for (std::list<t_line>::const_iterator iter = m_hiddenLines.begin(); iter != m_hiddenLines.end(); iter++)
 
437
                for (std::list<t_line>::const_iterator iter = m_hiddenLines.begin(); iter != m_hiddenLines.end(); ++iter)
440
438
                {
441
439
                        AddToLog(iter->messagetype, iter->message, iter->time);
442
440
                }