merge branch work back into trunk

[xonotic/netradiant.git] / radiant / gtkmisc.cpp

diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp
index 761d204a3b6db8e04cb04ddf0c41a2aa87533ea2..6b54918018de2cdd0b2c8f6743426e6dda325b05 100644 (file)
--- a/radiant/gtkmisc.cpp
+++ b/radiant/gtkmisc.cpp
@@ -859,7 +859,7 @@ void dialog_button_callback( GtkWidget *widget, gpointer data ) {
   ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" );
 
   *loop = 0;
-  *ret = (int)data;
+  *ret = GPOINTER_TO_INT (data);
 }
 
 gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data)
@@ -924,7 +924,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti
 
   if (mode == MB_OK)
   {
-    w = gtk_button_new_with_label ("Ok");
+    w = gtk_button_new_with_label (_("Ok"));
     gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
     gtk_signal_connect (GTK_OBJECT (w), "clicked",
                         GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDOK));
@@ -937,7 +937,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti
   }
   else if (mode ==  MB_OKCANCEL)
   {
-    w = gtk_button_new_with_label ("Ok");
+    w = gtk_button_new_with_label (_("Ok"));
     gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
     gtk_signal_connect (GTK_OBJECT (w), "clicked",
                         GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDOK));
@@ -946,7 +946,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti
     gtk_widget_grab_default (w);
     gtk_widget_show (w);
 
-    w = gtk_button_new_with_label ("Cancel");
+    w = gtk_button_new_with_label (_("Cancel"));
     gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
     gtk_signal_connect (GTK_OBJECT (w), "clicked",
                         GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDCANCEL));
@@ -956,7 +956,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti
   }
   else if (mode == MB_YESNOCANCEL)
   {
-    w = gtk_button_new_with_label ("Yes");
+    w = gtk_button_new_with_label (_("Yes"));
     gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
     gtk_signal_connect (GTK_OBJECT (w), "clicked",
                         GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDYES));
@@ -964,13 +964,13 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti
     gtk_widget_grab_default (w);
     gtk_widget_show (w);
 
-    w = gtk_button_new_with_label ("No");
+    w = gtk_button_new_with_label (_("No"));
     gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
     gtk_signal_connect (GTK_OBJECT (w), "clicked",
                         GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDNO));
     gtk_widget_show (w);
 
-    w = gtk_button_new_with_label ("Cancel");
+    w = gtk_button_new_with_label (_("Cancel"));
     gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
     gtk_signal_connect (GTK_OBJECT (w), "clicked",
                         GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDCANCEL));
@@ -979,7 +979,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti
   }
   else /* if (mode == MB_YESNO) */
   {
-    w = gtk_button_new_with_label ("Yes");
+    w = gtk_button_new_with_label (_("Yes"));
     gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
     gtk_signal_connect (GTK_OBJECT (w), "clicked",
                         GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDYES));
@@ -987,7 +987,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti
     gtk_widget_grab_default (w);
     gtk_widget_show (w);
 
-    w = gtk_button_new_with_label ("No");
+    w = gtk_button_new_with_label (_("No"));
     gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
     gtk_signal_connect (GTK_OBJECT (w), "clicked",
                         GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (IDNO));
@@ -997,7 +997,7 @@ int WINAPI gtk_MessageBox (void *parent, const char* lpText, const char* lpCapti
 
   if (URL)
   {
-    w = gtk_button_new_with_label ("Go to URL");
+    w = gtk_button_new_with_label (_("Go to URL"));
     gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
     gtk_signal_connect (GTK_OBJECT (w), "clicked",
                         GTK_SIGNAL_FUNC (dialog_url_callback), NULL);
@@ -1037,7 +1037,7 @@ static void file_sel_callback (GtkWidget *widget, gpointer data)
   loop = (int*)g_object_get_data (G_OBJECT (parent), "loop");
   success = (bool*)g_object_get_data (G_OBJECT (parent), "success");
 
-  if ((int)data == IDOK)
+  if (GPOINTER_TO_INT (data) == IDOK)
     *success = true;
 
 #ifdef FILEDLG_DBG
@@ -1474,8 +1474,9 @@ char* WINAPI dir_dialog (void *parent, const char* title, const char* path)
                       GTK_SIGNAL_FUNC (dialog_delete_callback), NULL);
   gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (file_sel));
 
-  if (parent != NULL)
-    gtk_window_set_transient_for (GTK_WINDOW (file_sel), GTK_WINDOW (parent));
+       if ( parent != NULL ) {
+               gtk_window_set_transient_for( GTK_WINDOW( file_sel ), GTK_WINDOW( parent ) );
+       }
 
   gtk_widget_hide (GTK_FILE_SELECTION (file_sel)->file_list->parent);
 
@@ -1491,10 +1492,10 @@ char* WINAPI dir_dialog (void *parent, const char* title, const char* path)
   while (loop)
     gtk_main_iteration ();
 
-  filename = g_strdup(gtk_file_selection_get_filename (GTK_FILE_SELECTION (file_sel)));
+  filename = g_strdup( gtk_file_selection_get_filename( GTK_FILE_SELECTION( file_sel ) ) );
 
-  gtk_grab_remove (file_sel);
-  gtk_widget_destroy (file_sel);
+  gtk_grab_remove( file_sel );
+  gtk_widget_destroy( file_sel );
 
   return filename;
 }