added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/resource.h b/include/wx/resource.h
index 8eec715169cd0f9c15f64ebe18fbf665c3012474..37c4e864567d6536a9f89ea6d6373fa08d9913d7 100644 (file)
--- a/include/wx/resource.h
+++ b/include/wx/resource.h
@@ -12,7 +12,7 @@
 #ifndef _WX_RESOURCEH__
 #define _WX_RESOURCEH__
 
 #ifndef _WX_RESOURCEH__
 #define _WX_RESOURCEH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "resource.h"
 #endif
 
 #pragma interface "resource.h"
 #endif
 


@@ -198,6 +198,9 @@ WXDLLEXPORT extern bool wxResourceRegisterBitmapData(const wxString& name, char
 WXDLLEXPORT extern bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *table = (wxResourceTable *) NULL);
 WXDLLEXPORT extern int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table = (wxResourceTable *) NULL);
 
 WXDLLEXPORT extern bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *table = (wxResourceTable *) NULL);
 WXDLLEXPORT extern int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table = (wxResourceTable *) NULL);
 

+#if defined(__WXPM__)
+#include "wx/os2/wxrsc.h"
+#endif

 #endif
 #endif
     // _WX_RESOURCEH__
 #endif
 #endif
     // _WX_RESOURCEH__