← Back to branch summary

~shevonar/widelands/reworking-menus

« back to all changes in this revision

Viewing changes to src/wui/interactive_base.h

  • Committer: Shevonar
  • Date: 2013-01-15 23:15:22 UTC
  • mfrom: (6432.1.56 trunk)
  • Revision ID: infomh@anmaruco.de-20130115231522-782njbcagjo6olef
merged current trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/wui/interactive_base.h
113
113
        virtual void cleanup_for_load() {};
114
114
 
115
115
private:
116
 
        static int32_t get_xres();
117
 
        static int32_t get_yres();
118
 
 
119
116
        void roadb_add_overlay   ();
120
117
        void roadb_remove_overlay();
121
118
 
130
127
                                         Widelands::TCoords<>
131
128
                                                (Widelands::Coords(0, 0), Widelands::TCoords<>::D)),
132
129
                         const uint32_t Radius                   = 0,
133
 
                         const PictureID Pic                     = g_gr->get_no_picture(),
 
130
                         const IPicture* Pic                     = NULL,
134
131
                         const Overlay_Manager::Job_Id Jobid = Overlay_Manager::Job_Id::Null())
135
132
                        :
136
133
                        freeze(Freeze), triangles(Triangles), pos(Pos), radius(Radius),
140
137
                bool              triangles; //  otherwise nodes
141
138
                Widelands::Node_and_Triangle<>     pos;
142
139
                uint32_t              radius;
143
 
                PictureID             pic;
 
140
                const IPicture* pic;
144
141
                Overlay_Manager::Job_Id jobid;
145
142
        } m_sel;
146
143
 
186
183
        UI::UniqueWindow::Registry m_debugconsole;
187
184
};
188
185
 
189
 
#define PIC2 g_gr->get_picture(PicMod_UI, "pics/but2.png")
 
186
#define PIC2 g_gr->imgcache().load(PicMod_UI, "pics/but2.png")
190
187
#define TOOLBAR_BUTTON_COMMON_PARAMETERS(name) \
191
188
    &m_toolbar, name, 0, 0, 34U, 34U, PIC2
192
189