X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..674ac8b919eecbc201b5f23b470a567cd0565e10:/src/common/resource.cpp

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index 22337514a1..e600787ff3 100644
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -643,7 +643,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
   if (useDefaults != 0)
     dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_USE_DEFAULTS);
 
-  long id = 0;
+  int id = 0;
   expr->GetAttributeValue(wxT("id"), id);
   dialogItem->SetId(id);
 
@@ -2190,8 +2190,8 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         return wxBitmap(item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()) ;
 #else
         wxLogWarning(_("No XBM facility available!"));
-#endif
         break;
+#endif
       }
       case wxBITMAP_TYPE_XPM_DATA:
       {
@@ -2206,13 +2206,12 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         return wxBitmap((char **)item->GetValue1());
 #else
         wxLogWarning(_("No XPM facility available!"));
-#endif
         break;
+#endif
       }
       default:
       {
         return wxBitmap(name, bitmapType);
-        break;
       }
     }
     return wxNullBitmap;
@@ -2345,8 +2344,8 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
         return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
 #else
         wxLogWarning(_("No XBM facility available!"));
-#endif
         break;
+#endif
       }
       case wxBITMAP_TYPE_XPM_DATA:
       {