← Back to branch summary

~vcs-imports/etracer/trunk

« back to all changes in this revision

Viewing changes to src/gui.cpp

  • Committer: pkeus
  • Date: 2014-07-13 19:05:24 UTC
  • Revision ID: svn-v4:0420edf4-82e4-42fc-9478-35b55e6d67a3:branches/SFML2:521
Refactorizations:
- Visual Studio: Increased warning level to W4 (minus C4100 and C4512), enabled /Zc:inline
- Replaced NULL by nullptr
- Replaced 3 dynamically allocated arrays by a single std::vector CCourse::Fields
- Fixed a few MSVC W4 warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui.cpp
651
651
}
652
652
 
653
653
TWidget* ClickGUI(int x, int y) {
654
 
        TWidget* clicked = NULL;
 
654
        TWidget* clicked = nullptr;
655
655
        for (size_t i = 0; i < Widgets.size(); i++) {
656
656
                if (Widgets[i]->Click(x, y)) {
657
657
                        clicked = Widgets[i];
811
811
        return Winsys.resolution.height * percent / 100.0;
812
812
}
813
813
 
814
 
TArea AutoAreaN(double top_perc, double bott_perc, int w) {
 
814
TArea AutoAreaN(double top_perc, double bott_perc, unsigned int w) {
815
815
        TArea res;
816
816
        res.top = AutoYPosN(top_perc);
817
817
        res.bottom = AutoYPosN(bott_perc);