supporting clang memory management annotations

[wxWidgets.git] / include / wx / gdicmn.h

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index bf7fa6079226a041682267c84520fe3c78427cc6..3ef7d6c98cfd286c62b0a2a0d548f567fd08beeb 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -160,14 +160,18 @@ enum wxStockCursor
 // macros
 // ---------------------------------------------------------------------------
 
 // macros
 // ---------------------------------------------------------------------------
 

+#if defined(__WINDOWS__) || defined(__WXPM__)
+    #define wxHAS_IMAGES_IN_RESOURCES
+#endif
+

 /* Useful macro for creating icons portably, for example:
 
     wxIcon *icon = new wxICON(sample);
 
   expands into:
 
 /* Useful macro for creating icons portably, for example:
 
     wxIcon *icon = new wxICON(sample);
 
   expands into:
 

-    wxIcon *icon = new wxIcon("sample");      // On wxMSW
-    wxIcon *icon = new wxIcon(sample_xpm);    // On wxGTK
+    wxIcon *icon = new wxIcon("sample");      // On Windows
+    wxIcon *icon = new wxIcon(sample_xpm);    // On wxGTK/Linux

  */
 
 #ifdef __WXMSW__
  */
 
 #ifdef __WXMSW__


@@ -176,9 +180,6 @@ enum wxStockCursor
 #elif defined(__WXPM__)
     // Load from a resource
     #define wxICON(X) wxIcon(wxT(#X))
 #elif defined(__WXPM__)
     // Load from a resource
     #define wxICON(X) wxIcon(wxT(#X))

-#elif defined(__WXMGL__)
-    // Initialize from an included XPM
-    #define wxICON(X) wxIcon( X##_xpm )

 #elif defined(__WXDFB__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )
 #elif defined(__WXDFB__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )


@@ -209,7 +210,6 @@ enum wxStockCursor
       defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \
       defined(__WXMAC__)   || \
       defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \
       defined(__WXMAC__)   || \

-      defined(__WXMGL__)   || \

       defined(__WXDFB__)   || \
       defined(__WXCOCOA__)
     // Initialize from an included XPM
       defined(__WXDFB__)   || \
       defined(__WXCOCOA__)
     // Initialize from an included XPM