← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/interface/themeprovider.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/themeprovider.cpp
71
71
 
72
72
        wxLogNull logNull;
73
73
 
74
 
        for (std::list<wxString>::const_iterator iter = dirs.begin(); iter != dirs.end(); iter++)
 
74
        for (std::list<wxString>::const_iterator iter = dirs.begin(); iter != dirs.end(); ++iter)
75
75
        {
76
76
                wxString fileName = *iter + name + _T(".png");
77
77
//#ifdef __WXMSW__
78
78
                // MSW toolbar only greys out disabled buttons in a visually
79
 
                // pleasing way if the bitmap has an alpha channel. 
 
79
                // pleasing way if the bitmap has an alpha channel.
80
80
                wxImage img(fileName, wxBITMAP_TYPE_PNG);
81
81
                if (!img.Ok())
82
82
                        continue;
278
278
        if (wxFile::Exists(themePath + _T("theme.xml")))
279
279
                return themePath;
280
280
 
281
 
    themePath = resourceDir + _T("opencrystal/");
 
281
        themePath = resourceDir + _T("opencrystal/");
282
282
        if (wxFile::Exists(themePath + _T("theme.xml")))
283
283
                return themePath;
284
284