mail[Wesnoth-commits] r43339 - /trunk/src/preferences_display.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by koraq on June 12, 2010 - 18:03:
Author: mordante
Date: Sat Jun 12 18:03:01 2010
New Revision: 43339

URL: http://svn.gna.org/viewcvs/wesnoth?rev=43339&view=rev
Log:
Make Wesnoth more compatible with C++0x (g++-4.5).

Modified:
    trunk/src/preferences_display.cpp

Modified: trunk/src/preferences_display.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/preferences_display.cpp?rev=43339&r1=43338&r2=43339&view=diff
==============================================================================
--- trunk/src/preferences_display.cpp (original)
+++ trunk/src/preferences_display.cpp Sat Jun 12 18:03:01 2010
@@ -294,7 +294,7 @@
        f.layout(xpos,ypos,width,height);
        f.draw();
 
-       SDL_Rect clip_rect = { 0, 0, disp.w (), disp.h () };
+       SDL_Rect clip_rect = create_rect(0, 0, disp.w (), disp.h ());
        SDL_Rect text_size = font::draw_text(NULL, clip_rect, 
font::SIZE_LARGE,
                                             font::NORMAL_COLOR,_("Press 
desired Hotkey (Esc cancels)"),
                                             0, 0);
@@ -351,10 +351,11 @@
 
                if (change_button.pressed () || menu_.double_clicked()) {
                        // Lets change this hotkey......
-                       SDL_Rect dlgr = {centerx-text_size.w/2 - 30,
-                                                               
centery-text_size.h/2 - 16,
-                                                                       
text_size.w+60,
-                                                                       
text_size.h+32};
+                       SDL_Rect dlgr = create_rect(centerx - text_size.w / 2 
- 30
+                                       , centery - text_size.h / 2 - 16
+                                       , text_size.w + 60
+                                       , text_size.h + 32);
+
                        surface_restorer restorer(&disp.video(),dlgr);
                        gui::dialog_frame mini_frame(disp.video());
                        mini_frame.layout(centerx-text_size.w/2 - 20,




Related Messages


Powered by MHonArc, Updated Sat Jun 12 18:20:18 2010