[Desmume-cvs] SF.net SVN: desmume:[1369] trunk/desmume/src/gtk/main.cpp

[<ric...@us...>]

Revision: 1369
          http://desmume.svn.sourceforge.net/desmume/?rev=1369&view=rev
Author:   riccardom
Date:     2009-01-03 21:10:56 +0000 (Sat, 03 Jan 2009)

Log Message:
-----------
cleanup status bar code: convert pStatusBar_Change from macro to function, convert pStatusBar_Ctx from global to local

Modified Paths:
--------------
    trunk/desmume/src/gtk/main.cpp

Modified: trunk/desmume/src/gtk/main.cpp
===================================================================
--- trunk/desmume/src/gtk/main.cpp	2009-01-03 20:30:03 UTC (rev 1368)
+++ trunk/desmume/src/gtk/main.cpp	2009-01-03 21:10:56 UTC (rev 1369)
@@ -333,9 +333,15 @@
 
 static BOOL regMainLoop = FALSE;
 
-static gint pStatusBar_Ctx;
-#define pStatusBar_Change(t) gtk_statusbar_pop(GTK_STATUSBAR(pStatusBar), pStatusBar_Ctx); gtk_statusbar_push(GTK_STATUSBAR(pStatusBar), pStatusBar_Ctx, t)
+static inline void pStatusBar_Change (const char *message)
+{
+	gint pStatusBar_Ctx;
 
+	pStatusBar_Ctx = gtk_statusbar_get_context_id(GTK_STATUSBAR(pStatusBar), "Global");
+	gtk_statusbar_pop(GTK_STATUSBAR(pStatusBar), pStatusBar_Ctx);
+	gtk_statusbar_push(GTK_STATUSBAR(pStatusBar), pStatusBar_Ctx, message);
+}
+
 gboolean EmuLoop(gpointer data);
 
 static void About(GtkWidget* widget, gpointer data)
@@ -1599,6 +1605,7 @@
 	GtkAccelGroup * accel_group;
 	GtkWidget *pVBox;
 	GtkWidget *pMenuBar;
+	gint pStatusBar_Ctx;
 
 #ifdef GTKGLEXT_AVAILABLE
         GdkGLConfig *glconfig;
@@ -1846,14 +1853,10 @@
             nds_screen_widget = pDrawingArea;
         }
 
-	/* Cr\xE9ation de la barre d'\xE9tat */
-
+	/* Status bar */
 	pStatusBar = gtk_statusbar_new();
-
 	pStatusBar_Ctx = gtk_statusbar_get_context_id(GTK_STATUSBAR(pStatusBar), "Global");
-
 	pStatusBar_Change("Desmume");
-
 	gtk_box_pack_end(GTK_BOX(pVBox), pStatusBar, FALSE, FALSE, 0);
 
 	gtk_widget_show_all(pWindow);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.