[Pingus-CVS] r3959 - in trunk/pingus/src: . editor

[grumbel at BerliOS]

Author: grumbel
Date: 2009-02-24 11:00:07 +0100 (Tue, 24 Feb 2009)
New Revision: 3959

Modified:
   trunk/pingus/src/editor/editor_screen.hpp
   trunk/pingus/src/option_menu.cpp
Log:
Some -Wall fixes

Modified: trunk/pingus/src/editor/editor_screen.hpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.hpp   2009-02-24 09:55:14 UTC (rev 
3958)
+++ trunk/pingus/src/editor/editor_screen.hpp   2009-02-24 10:00:07 UTC (rev 
3959)
@@ -24,7 +24,6 @@
 
 class DrawingContext;
 class FileDialog;
-class GUI::GUIManager;
 class Pathname;
 
 namespace Editor {

Modified: trunk/pingus/src/option_menu.cpp
===================================================================
--- trunk/pingus/src/option_menu.cpp    2009-02-24 09:55:14 UTC (rev 3958)
+++ trunk/pingus/src/option_menu.cpp    2009-02-24 10:00:07 UTC (rev 3959)
@@ -80,22 +80,22 @@
   y_pos = 0;
 
   int resolutions[][2] = {
-    640, 480,   // 4:3, VGA
-    768, 576,   // 4:3, PAL
-    800, 480,   // Nokia N770, N800
-    800, 600,   // 4:3, SVGA
-    1024, 768,  // 4:3, XGA
-    1152, 864,  // 4:3
-    1280, 720,  // 16:9, HD-TV, 720p
-    1280, 960,  // 4:3
-    1280, 1024, // 5:4
-    1366, 768,  // ~16:9, Wide XGA
-    1440, 900,  // 16:10
-    1600, 1200, // 4:3, UXGA
-    1680, 1050, // 16:10, WSXGA
-    1920, 1080, // 16:9, HD-TV, 1080p
-    1920, 1200, // 16:10
-    -1, -1,
+    { 640, 480 },   // 4:3, VGA
+    { 768, 576 },   // 4:3, PAL
+    { 800, 480 },   // Nokia N770, N800
+    { 800, 600 },   // 4:3, SVGA
+    { 1024, 768 },  // 4:3, XGA
+    { 1152, 864 },  // 4:3
+    { 1280, 720 },  // 16:9, HD-TV, 720p
+    { 1280, 960 },  // 4:3
+    { 1280, 1024 }, // 5:4
+    { 1366, 768 },  // ~16:9, Wide XGA
+    { 1440, 900, }, // 16:10
+    { 1600, 1200 }, // 4:3, UXGA
+    { 1680, 1050 }, // 16:10, WSXGA
+    { 1920, 1080 }, // 16:9, HD-TV, 1080p
+    { 1920, 1200 }, // 16:10
+    { -1, -1 }
   };
   int current_choice = -1;
   int n;