as we no longer need to have the stock icon label strings in two places (GTK2 will take care of the stock labels once registered), move the strings into toolbar.c and remove the no longer required definitions from compat_macros.h altogether

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24920 f5534014-38df-0310-8fa8-9805f1628bb7

2 files changed, 47 insertions, 99 deletions

diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index cf3a6bd3ef..d85150f2d6 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -36,61 +36,9 @@
  *              gtk_widget_set_size_request, ...
  */
 
-#ifdef HAVE_LIBPCAP
-#define WIRESHARK_STOCK_LABEL_CAPTURE_INTERFACES       "_Interfaces"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_AIRPCAP          "_Wireless"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_OPTIONS          "_Options"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_START            "_Start"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_STOP             "S_top"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_RESTART          "_Restart"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_FILTER           "_CFilter"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_FILTER_ENTRY     "_Capture Filter:"
-#define WIRESHARK_STOCK_LABEL_CAPTURE_DETAILS          "_Details"
-#endif
-#define WIRESHARK_STOCK_LABEL_DISPLAY_FILTER           "_Filter"
-#define WIRESHARK_STOCK_LABEL_DISPLAY_FILTER_ENTRY     "_Filter:"
-#define WIRESHARK_STOCK_LABEL_PREFS                    "_Prefs"
-#define WIRESHARK_STOCK_LABEL_BROWSE                   "_Browse..."
-#define WIRESHARK_STOCK_LABEL_CREATE_STAT              "Create _Stat"
-#define WIRESHARK_STOCK_LABEL_EXPORT                   "_Export..."
-#define WIRESHARK_STOCK_LABEL_IMPORT                   "_Import..."
-#define WIRESHARK_STOCK_LABEL_EDIT                     "_Edit..."
-#define WIRESHARK_STOCK_LABEL_ADD_EXPRESSION           "_Expression..." /* plus sign coming from icon */
-#define WIRESHARK_STOCK_LABEL_DONT_SAVE                "Continue _without Saving"
-#define WIRESHARK_STOCK_LABEL_ABOUT                    "_About"
-#define WIRESHARK_STOCK_LABEL_COLORIZE                 "_Colorize"
-#define WIRESHARK_STOCK_LABEL_AUTOSCROLL               "_Auto Scroll in Live Capture"
-#define WIRESHARK_STOCK_LABEL_RESIZE_COLUMNS           "Resize Columns"
-#define WIRESHARK_STOCK_LABEL_TIME                     "Time"
-#define WIRESHARK_STOCK_LABEL_INTERNET                 "Internet"
-#define WIRESHARK_STOCK_LABEL_WEB_SUPPORT              "Web Support"
-#define WIRESHARK_STOCK_LABEL_WIKI                     "Wiki"
-#define WIRESHARK_STOCK_LABEL_CONVERSATIONS            "Conversations"
-#define WIRESHARK_STOCK_LABEL_ENDPOINTS                "Endpoints"
-#define WIRESHARK_STOCK_LABEL_GRAPHS                   "Graphs"
-#define WIRESHARK_STOCK_LABEL_TELEPHONY                "Telephony"
-#define WIRESHARK_STOCK_LABEL_DECODE_AS                "Decode As"
-#define WIRESHARK_STOCK_LABEL_CHECKBOX                 "Checkbox"
-#define WIRESHARK_STOCK_LABEL_FILE_SET_LIST            "List Files"
-#define WIRESHARK_STOCK_LABEL_FILE_SET_NEXT            "Next File"
-#define WIRESHARK_STOCK_LABEL_FILE_SET_PREVIOUS        "Previous File"
-#define WIRESHARK_STOCK_LABEL_FILTER_OUT_STREAM        "Filter Out This Stream"
-#define WIRESHARK_STOCK_LABEL_ENABLE                   "Enable"
-#define WIRESHARK_STOCK_LABEL_DISABLE                  "Disable"
-#define WIRESHARK_STOCK_LABEL_COLOR1                   "Color 1"
-#define WIRESHARK_STOCK_LABEL_COLOR2                   "Color 2"
-#define WIRESHARK_STOCK_LABEL_COLOR3                   "Color 3"
-#define WIRESHARK_STOCK_LABEL_COLOR4                   "Color 4"
-#define WIRESHARK_STOCK_LABEL_COLOR5                   "Color 5"
-#define WIRESHARK_STOCK_LABEL_COLOR6                   "Color 6"
-#define WIRESHARK_STOCK_LABEL_COLOR7                   "Color 7"
-#define WIRESHARK_STOCK_LABEL_COLOR8                   "Color 8"
-#define WIRESHARK_STOCK_LABEL_COLOR9                   "Color 9"
-#define WIRESHARK_STOCK_LABEL_COLOR0                   "Color 10"
 
 #ifdef HAVE_LIBPCAP
 #define WIRESHARK_STOCK_CAPTURE_INTERFACES       "Wireshark_Stock_CaptureInterfaces"
-#define WIRESHARK_STOCK_CAPTURE_AIRPCAP			 "Wireshark_Stock_CaptureAirpcap"
 #define WIRESHARK_STOCK_CAPTURE_OPTIONS          "Wireshark_Stock_CaptureOptionss"
 #define WIRESHARK_STOCK_CAPTURE_START            "Wireshark_Stock_CaptureStart"
 #define WIRESHARK_STOCK_CAPTURE_STOP             "Wireshark_Stock_CaptureStop"
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 27038acb65..9ccef2f8d4 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -146,54 +146,54 @@ static void wireshark_stock_icons(void) {
     /* register non-standard pixmaps with the gtk-stock engine */
     static const GtkStockItem stock_items[] = {
 #ifdef HAVE_LIBPCAP
-        { WIRESHARK_STOCK_CAPTURE_INTERFACES,    WIRESHARK_STOCK_LABEL_CAPTURE_INTERFACES,    0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_OPTIONS,       WIRESHARK_STOCK_LABEL_CAPTURE_OPTIONS,       0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_START,         WIRESHARK_STOCK_LABEL_CAPTURE_START,         0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_STOP,          WIRESHARK_STOCK_LABEL_CAPTURE_STOP,          0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_RESTART,       WIRESHARK_STOCK_LABEL_CAPTURE_RESTART,       0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_FILTER,        WIRESHARK_STOCK_LABEL_CAPTURE_FILTER,        0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY,  WIRESHARK_STOCK_LABEL_CAPTURE_FILTER_ENTRY,  0, 0, NULL },
-        { WIRESHARK_STOCK_CAPTURE_DETAILS,       WIRESHARK_STOCK_LABEL_CAPTURE_DETAILS,       0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_INTERFACES,    "_Interfaces",    0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_OPTIONS,       "_Options",       0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_START,         "_Start",         0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_STOP,          "S_top",          0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_RESTART,       "_Restart",       0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_FILTER,        "_CFilter",        0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_FILTER_ENTRY,  "_Capture Filter:",  0, 0, NULL },
+        { WIRESHARK_STOCK_CAPTURE_DETAILS,       "_Details",       0, 0, NULL },
 #endif
-        { WIRESHARK_STOCK_DISPLAY_FILTER,        WIRESHARK_STOCK_LABEL_DISPLAY_FILTER,        0, 0, NULL },
-        { WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY,  WIRESHARK_STOCK_LABEL_DISPLAY_FILTER_ENTRY,  0, 0, NULL },
-        { WIRESHARK_STOCK_BROWSE,                WIRESHARK_STOCK_LABEL_BROWSE,                0, 0, NULL },
-        { WIRESHARK_STOCK_CREATE_STAT,           WIRESHARK_STOCK_LABEL_CREATE_STAT,           0, 0, NULL },
-        { WIRESHARK_STOCK_EXPORT,                WIRESHARK_STOCK_LABEL_EXPORT,                0, 0, NULL },
-        { WIRESHARK_STOCK_IMPORT,                WIRESHARK_STOCK_LABEL_IMPORT,                0, 0, NULL },
-        { WIRESHARK_STOCK_EDIT,                  WIRESHARK_STOCK_LABEL_EDIT,                  0, 0, NULL },
-        { WIRESHARK_STOCK_ADD_EXPRESSION,        WIRESHARK_STOCK_LABEL_ADD_EXPRESSION,        0, 0, NULL },
-        { WIRESHARK_STOCK_DONT_SAVE,             WIRESHARK_STOCK_LABEL_DONT_SAVE,             0, 0, NULL },
-        { WIRESHARK_STOCK_ABOUT,                 WIRESHARK_STOCK_LABEL_ABOUT,                 0, 0, NULL },
-        { WIRESHARK_STOCK_COLORIZE,              WIRESHARK_STOCK_LABEL_COLORIZE,              0, 0, NULL },
-        { WIRESHARK_STOCK_AUTOSCROLL,            WIRESHARK_STOCK_LABEL_AUTOSCROLL,            0, 0, NULL },
-        { WIRESHARK_STOCK_RESIZE_COLUMNS,        WIRESHARK_STOCK_LABEL_RESIZE_COLUMNS,        0, 0, NULL },
-        { WIRESHARK_STOCK_TIME,                  WIRESHARK_STOCK_LABEL_TIME,                  0, 0, NULL },
-        { WIRESHARK_STOCK_INTERNET,              WIRESHARK_STOCK_LABEL_INTERNET,              0, 0, NULL },
-        { WIRESHARK_STOCK_WEB_SUPPORT,           WIRESHARK_STOCK_LABEL_WEB_SUPPORT,           0, 0, NULL },
-        { WIRESHARK_STOCK_WIKI,                  WIRESHARK_STOCK_LABEL_WIKI,                  0, 0, NULL },
-        { WIRESHARK_STOCK_CONVERSATIONS,         WIRESHARK_STOCK_LABEL_CONVERSATIONS,         0, 0, NULL },
-        { WIRESHARK_STOCK_ENDPOINTS,             WIRESHARK_STOCK_LABEL_ENDPOINTS,             0, 0, NULL },
-        { WIRESHARK_STOCK_GRAPHS,                WIRESHARK_STOCK_LABEL_GRAPHS,                0, 0, NULL },
-        { WIRESHARK_STOCK_TELEPHONY,             WIRESHARK_STOCK_LABEL_TELEPHONY,             0, 0, NULL },
-        { WIRESHARK_STOCK_DECODE_AS,             WIRESHARK_STOCK_LABEL_DECODE_AS,             0, 0, NULL },
-        { WIRESHARK_STOCK_CHECKBOX,              WIRESHARK_STOCK_LABEL_CHECKBOX,              0, 0, NULL },
-        { WIRESHARK_STOCK_FILE_SET_LIST,         WIRESHARK_STOCK_LABEL_FILE_SET_LIST,         0, 0, NULL },
-        { WIRESHARK_STOCK_FILE_SET_NEXT,         WIRESHARK_STOCK_LABEL_FILE_SET_NEXT,         0, 0, NULL },
-        { WIRESHARK_STOCK_FILE_SET_PREVIOUS,     WIRESHARK_STOCK_LABEL_FILE_SET_PREVIOUS,     0, 0, NULL },
-        { WIRESHARK_STOCK_FILTER_OUT_STREAM,     WIRESHARK_STOCK_LABEL_FILTER_OUT_STREAM,     0, 0, NULL },
-        { WIRESHARK_STOCK_ENABLE,                WIRESHARK_STOCK_LABEL_ENABLE,                0, 0, NULL },
-        { WIRESHARK_STOCK_DISABLE,               WIRESHARK_STOCK_LABEL_DISABLE,               0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR1,                WIRESHARK_STOCK_LABEL_COLOR1,                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR2,                WIRESHARK_STOCK_LABEL_COLOR2,                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR3,                WIRESHARK_STOCK_LABEL_COLOR3,                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR4,                WIRESHARK_STOCK_LABEL_COLOR4,                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR5,                WIRESHARK_STOCK_LABEL_COLOR5,                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR6,                WIRESHARK_STOCK_LABEL_COLOR6,                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR7,                WIRESHARK_STOCK_LABEL_COLOR7,                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR8,                WIRESHARK_STOCK_LABEL_COLOR8,                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR9,                WIRESHARK_STOCK_LABEL_COLOR9,                0, 0, NULL },
-        { WIRESHARK_STOCK_COLOR0,                WIRESHARK_STOCK_LABEL_COLOR0,                0, 0, NULL }
+        { WIRESHARK_STOCK_DISPLAY_FILTER,        "_Filter",        0, 0, NULL },
+        { WIRESHARK_STOCK_DISPLAY_FILTER_ENTRY,  "_Filter:",  0, 0, NULL },
+        { WIRESHARK_STOCK_BROWSE,                "_Browse...",                0, 0, NULL },
+        { WIRESHARK_STOCK_CREATE_STAT,           "Create _Stat",           0, 0, NULL },
+        { WIRESHARK_STOCK_EXPORT,                "_Export...",                0, 0, NULL },
+        { WIRESHARK_STOCK_IMPORT,                "_Import...",                0, 0, NULL },
+        { WIRESHARK_STOCK_EDIT,                  "_Edit...",                  0, 0, NULL },
+        { WIRESHARK_STOCK_ADD_EXPRESSION,        "_Expression..." ,        0, 0, NULL }, /* plus sign coming from icon */
+        { WIRESHARK_STOCK_DONT_SAVE,             "Continue _without Saving",             0, 0, NULL },
+        { WIRESHARK_STOCK_ABOUT,                 "_About",                 0, 0, NULL },
+        { WIRESHARK_STOCK_COLORIZE,              "_Colorize",              0, 0, NULL },
+        { WIRESHARK_STOCK_AUTOSCROLL,            "_Auto Scroll in Live Capture",            0, 0, NULL },
+        { WIRESHARK_STOCK_RESIZE_COLUMNS,        "Resize Columns",        0, 0, NULL },
+        { WIRESHARK_STOCK_TIME,                  "Time",                  0, 0, NULL },
+        { WIRESHARK_STOCK_INTERNET,              "Internet",              0, 0, NULL },
+        { WIRESHARK_STOCK_WEB_SUPPORT,           "Web Support",           0, 0, NULL },
+        { WIRESHARK_STOCK_WIKI,                  "Wiki",                  0, 0, NULL },
+        { WIRESHARK_STOCK_CONVERSATIONS,         "Conversations",         0, 0, NULL },
+        { WIRESHARK_STOCK_ENDPOINTS,             "Endpoints",             0, 0, NULL },
+        { WIRESHARK_STOCK_GRAPHS,                "Graphs",                0, 0, NULL },
+        { WIRESHARK_STOCK_TELEPHONY,             "Telephony",             0, 0, NULL },
+        { WIRESHARK_STOCK_DECODE_AS,             "Decode As",             0, 0, NULL },
+        { WIRESHARK_STOCK_CHECKBOX,              "Checkbox",              0, 0, NULL },
+        { WIRESHARK_STOCK_FILE_SET_LIST,         "List Files",         0, 0, NULL },
+        { WIRESHARK_STOCK_FILE_SET_NEXT,         "Next File",         0, 0, NULL },
+        { WIRESHARK_STOCK_FILE_SET_PREVIOUS,     "Previous File",     0, 0, NULL },
+        { WIRESHARK_STOCK_FILTER_OUT_STREAM,     "Filter Out This Stream",     0, 0, NULL },
+        { WIRESHARK_STOCK_ENABLE,                "Enable",                0, 0, NULL },
+        { WIRESHARK_STOCK_DISABLE,               "Disable",               0, 0, NULL },
+        { WIRESHARK_STOCK_COLOR1,                "Color 1",                0, 0, NULL },
+        { WIRESHARK_STOCK_COLOR2,                "Color 2",                0, 0, NULL },
+        { WIRESHARK_STOCK_COLOR3,                "Color 3",                0, 0, NULL },
+        { WIRESHARK_STOCK_COLOR4,                "Color 4",                0, 0, NULL },
+        { WIRESHARK_STOCK_COLOR5,                "Color 5",                0, 0, NULL },
+        { WIRESHARK_STOCK_COLOR6,                "Color 6",                0, 0, NULL },
+        { WIRESHARK_STOCK_COLOR7,                "Color 7",                0, 0, NULL },
+        { WIRESHARK_STOCK_COLOR8,                "Color 8",                0, 0, NULL },
+        { WIRESHARK_STOCK_COLOR9,                "Color 9",                0, 0, NULL },
+        { WIRESHARK_STOCK_COLOR0,                "Color 10",                0, 0, NULL }
     };
 
     static const stock_pixmap_t pixmaps[] = {