Make the use of UIManager a configure option.

NOTE Only for Windows.

Additional moves to UIManager.

svn path=/trunk/; revision=37072

1 files changed, 46 insertions, 19 deletions

diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index 61bbdfdffc..f3335c0f57 100644
--- a/gtk/gsm_a_stat.c
+++ b/gtk/gsm_a_stat.c
@@ -435,11 +435,14 @@ gsm_a_stat_gtk_win_create(
     window_present(dlg_p->win);
 }
 
-
+#ifdef MAIN_MENU_USE_UIMANAGER
+void gsm_a_stat_gtk_bssmap_cb(GtkAction *action _U_, gpointer user_data _U_)
+#else
 static void
 gsm_a_stat_gtk_bssmap_cb(
     GtkWidget      *w _U_,
     gpointer        d _U_)
+#endif
 {
  /*   int           i;*/
 
@@ -490,10 +493,15 @@ gsm_a_stat_gtk_dtap_cb(
     gsm_a_stat_draw(&gsm_a_stat);
 }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+void 
+gsm_a_stat_gtk_dtap_mm_cb(GtkAction *action _U_, gpointer user_data _U_)
+#else
 static void
 gsm_a_stat_gtk_dtap_mm_cb(
     GtkWidget       *w _U_,
     gpointer        d _U_)
+#endif
 {
     gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_mm,
     "GSM A-I/F DTAP Mobility Management Statistics",
@@ -507,10 +515,15 @@ gsm_a_stat_gtk_dtap_mm_init(const char      *optarg _U_,
     gsm_a_stat_gtk_dtap_mm_cb(NULL, NULL);
 }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gsm_a_stat_gtk_dtap_rr_cb(GtkAction *action _U_, gpointer user_data _U_)
+#else
 static void
 gsm_a_stat_gtk_dtap_rr_cb(
     GtkWidget       *w _U_,
     gpointer        d _U_)
+#endif
 {
     gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_rr,
     "GSM A-I/F DTAP Radio Resource Management Statistics",
@@ -524,10 +537,15 @@ gsm_a_stat_gtk_dtap_rr_init(const char      *optarg _U_,
     gsm_a_stat_gtk_dtap_rr_cb(NULL, NULL);
 }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gsm_a_stat_gtk_dtap_cc_cb(GtkAction *action _U_, gpointer user_data _U_)
+#else
 static void
 gsm_a_stat_gtk_dtap_cc_cb(
     GtkWidget       *w _U_,
     gpointer        d _U_)
+#endif
 {
     gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_cc,
     "GSM A-I/F DTAP Call Control Statistics",
@@ -541,10 +559,15 @@ gsm_a_stat_gtk_dtap_cc_init(const char      *optarg _U_,
     gsm_a_stat_gtk_dtap_cc_cb(NULL, NULL);
 }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+void
+gsm_a_stat_gtk_dtap_gmm_cb(GtkAction *action _U_, gpointer user_data _U_)
+#else
 static void
 gsm_a_stat_gtk_dtap_gmm_cb(
     GtkWidget       *w _U_,
     gpointer        d _U_)
+#else
 {
     gsm_a_stat_gtk_dtap_cb(w, d, &dlg_dtap_gmm,
     "GSM A-I/F DTAP GPRS Mobility Management Statistics",
@@ -678,43 +701,47 @@ register_tap_listener_gtkgsm_a_stat(void)
         exit(1);
     }
 
+#ifdef MAIN_MENU_USE_UIMANAGER
+#else
     register_stat_menu_item("_GSM/A-Interface BSSMAP", REGISTER_STAT_GROUP_TELEPHONY,
     gsm_a_stat_gtk_bssmap_cb, NULL, NULL, NULL);
-    register_stat_cmd_arg("gsm_a,bssmap", gsm_a_stat_gtk_bssmap_init,NULL);
-
     register_stat_menu_item("_GSM/A-Interface DTAP/Mobility Management", REGISTER_STAT_GROUP_TELEPHONY,
     gsm_a_stat_gtk_dtap_mm_cb, NULL, NULL, NULL);
-    register_stat_cmd_arg("gsm_a,dtap_mm", gsm_a_stat_gtk_dtap_mm_init,NULL);
-
     register_stat_menu_item("_GSM/A-Interface DTAP/Radio Resource Management", REGISTER_STAT_GROUP_TELEPHONY,
     gsm_a_stat_gtk_dtap_rr_cb, NULL, NULL, NULL);
-    register_stat_cmd_arg("gsm_a,dtap_rr", gsm_a_stat_gtk_dtap_rr_init,NULL);
-
     register_stat_menu_item("_GSM/A-Interface DTAP/Call Control", REGISTER_STAT_GROUP_TELEPHONY,
     gsm_a_stat_gtk_dtap_cc_cb, NULL, NULL, NULL);
-    register_stat_cmd_arg("gsm_a,dtap_cc", gsm_a_stat_gtk_dtap_cc_init,NULL);
-
     register_stat_menu_item("_GSM/A-Interface DTAP/GPRS Mobility Management", REGISTER_STAT_GROUP_TELEPHONY,
     gsm_a_stat_gtk_dtap_gmm_cb, NULL, NULL, NULL);
-    register_stat_cmd_arg("gsm_a,dtap_gmm", gsm_a_stat_gtk_dtap_gmm_init,NULL);
-
     register_stat_menu_item("_GSM/A-Interface DTAP/Short Message Service", REGISTER_STAT_GROUP_TELEPHONY,
     gsm_a_stat_gtk_dtap_sms_cb, NULL, NULL, NULL);
-    register_stat_cmd_arg("gsm_a,dtap_sms", gsm_a_stat_gtk_dtap_sms_init,NULL);
-
     register_stat_menu_item("_GSM/A-Interface DTAP/GPRS Session Management", REGISTER_STAT_GROUP_TELEPHONY,
     gsm_a_stat_gtk_dtap_sm_cb, NULL, NULL, NULL);
-    register_stat_cmd_arg("gsm_a,dtap_sm", gsm_a_stat_gtk_dtap_sm_init,NULL);
-
     register_stat_menu_item("_GSM/A-Interface DTAP/Supplementary Services", REGISTER_STAT_GROUP_TELEPHONY,
     gsm_a_stat_gtk_dtap_ss_cb, NULL, NULL, NULL);
-    register_stat_cmd_arg("gsm_a,dtap_ss", gsm_a_stat_gtk_dtap_ss_init,NULL);
-
     register_stat_menu_item("_GSM/A-Interface DTAP/Special Conformance Testing Functions", REGISTER_STAT_GROUP_TELEPHONY,
     gsm_a_stat_gtk_dtap_tp_cb, NULL, NULL, NULL);
-    register_stat_cmd_arg("gsm_a,dtap_tp", gsm_a_stat_gtk_dtap_tp_init,NULL);
-
     register_stat_menu_item("_GSM/A-Interface SACCH", REGISTER_STAT_GROUP_TELEPHONY,
     gsm_a_stat_gtk_sacch_rr_cb, NULL, NULL, NULL);
+#endif
+
+    register_stat_cmd_arg("gsm_a,bssmap", gsm_a_stat_gtk_bssmap_init,NULL);
+
+    register_stat_cmd_arg("gsm_a,dtap_mm", gsm_a_stat_gtk_dtap_mm_init,NULL);
+
+    register_stat_cmd_arg("gsm_a,dtap_rr", gsm_a_stat_gtk_dtap_rr_init,NULL);
+
+    register_stat_cmd_arg("gsm_a,dtap_cc", gsm_a_stat_gtk_dtap_cc_init,NULL);
+
+    register_stat_cmd_arg("gsm_a,dtap_gmm", gsm_a_stat_gtk_dtap_gmm_init,NULL);
+
+    register_stat_cmd_arg("gsm_a,dtap_sms", gsm_a_stat_gtk_dtap_sms_init,NULL);
+
+    register_stat_cmd_arg("gsm_a,dtap_sm", gsm_a_stat_gtk_dtap_sm_init,NULL);
+
+    register_stat_cmd_arg("gsm_a,dtap_ss", gsm_a_stat_gtk_dtap_ss_init,NULL);
+
+    register_stat_cmd_arg("gsm_a,dtap_tp", gsm_a_stat_gtk_dtap_tp_init,NULL);
+
     register_stat_cmd_arg("gsm_a,sacch", gsm_a_stat_gtk_sacch_rr_init,NULL);
 }