← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/interface/xh_toolb_ex.h

  • 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/xh_toolb_ex.h
10
10
class wxToolBarXmlHandlerEx : public wxXmlResourceHandler
11
11
{
12
12
public:
13
 
    wxToolBarXmlHandlerEx();
14
 
    virtual wxObject *DoCreateResource();
15
 
    virtual bool CanHandle(wxXmlNode *node);
 
13
        wxToolBarXmlHandlerEx();
 
14
        virtual wxObject *DoCreateResource();
 
15
        virtual bool CanHandle(wxXmlNode *node);
16
16
 
17
17
        static void SetIconSize(const wxSize& size) { m_iconSize = size; }
18
18
 
19
19
private:
20
 
    bool m_isInside;
21
 
    wxToolBar *m_toolbar;
 
20
        bool m_isInside;
 
21
        wxToolBar *m_toolbar;
22
22
 
23
23
        static wxSize m_iconSize;
24
24
};