converted end of line characters (MSVC8 gives error C4335 on Mac EOLs)

[wxWidgets.git] / src / common / stockitem.cpp

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index 01b295f2941c4f124157e2098f287ec2cf631c3e..c6325d7a2e37ae991093cff74f0fedf6564273a1 100644 (file)
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -35,8 +35,7 @@ wxString wxGetStockItemLabel(wxStockItemID item)
 {
     #define STOCKITEM(stockid, label) \
         case stockid:                 \
-            return label;             \
-            break;
+            return label;
 
     switch (item)
     {
@@ -109,10 +108,19 @@ wxString wxGetStockItemLabel(wxStockItemID item)
 
 const char *wxStockItemToGTK(wxStockItemID item)
 {
-    #define STOCKITEM(stockid)    \
-        case wx##stockid:         \
-            return GTK_##stockid; \
-            break;
+    #define STOCKITEM(stockid)            \
+        case wx##stockid:                 \
+            return GTK_##stockid;
+    
+    #define STOCKITEM_MISSING(stockid)    \
+        case wx##stockid:                 \
+            return NULL;
+
+    #if GTK_CHECK_VERSION(2,4,0)
+        #define STOCKITEM_24(stockid) STOCKITEM(stockid)
+    #else
+        #define STOCKITEM_24(stockid) STOCKITEM_MISSING(stockid)
+    #endif
 
     switch (item)
     {
@@ -133,7 +141,7 @@ const char *wxStockItemToGTK(wxStockItemID item)
         STOCKITEM(STOCK_GO_UP)
         STOCKITEM(STOCK_HELP)
         STOCKITEM(STOCK_HOME)
-        STOCKITEM(STOCK_INDENT)
+        STOCKITEM_24(STOCK_INDENT)
         STOCKITEM(STOCK_INDEX)
         STOCKITEM(STOCK_ITALIC)
         STOCKITEM(STOCK_JUSTIFY_CENTER)
@@ -160,7 +168,7 @@ const char *wxStockItemToGTK(wxStockItemID item)
         STOCKITEM(STOCK_UNDELETE)
         STOCKITEM(STOCK_UNDERLINE)
         STOCKITEM(STOCK_UNDO)
-        STOCKITEM(STOCK_UNINDENT)
+        STOCKITEM_24(STOCK_UNINDENT)
         STOCKITEM(STOCK_YES)
         STOCKITEM(STOCK_ZOOM_100)
         STOCKITEM(STOCK_ZOOM_FIT)