Changed type of bitmaps. RC of DMC reported 'is not a valid Windows 3.0 or OS/2 1...

[wxWidgets.git] / contrib / utils / wxrcedit / propframe.h

diff --git a/contrib/utils/wxrcedit/propframe.h b/contrib/utils/wxrcedit/propframe.h
index 6a9595850047ace1d8c0000488dee9fcec953dd2..8f9cd7c74aa7535d1efa982faaaa88a5fad2877b 100644 (file)
--- a/contrib/utils/wxrcedit/propframe.h
+++ b/contrib/utils/wxrcedit/propframe.h
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

     #pragma interface "propframe.h"
 #endif
 
     #pragma interface "propframe.h"
 #endif
 


@@ -32,7 +32,7 @@ class PropertiesFrame : public wxFrame
         
         void ClearProps();
         void AddProps(PropertyInfoArray& plist);
         
         void ClearProps();
         void AddProps(PropertyInfoArray& plist);

-        void AddSingleProp(const PropertyInfo& pinfo);
+        void AddSingleProp(const PropertyInfo& pinfo, wxTreeItemId *root = NULL);

       
         static PropertiesFrame *Get();
            
       
         static PropertiesFrame *Get();