makefiles update

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

diff --git a/contrib/utils/wxrcedit/propedit.h b/contrib/utils/wxrcedit/propedit.h
index 04ff9c577d7650ef5a90032676ebfe70078a84ed..8676a3e262902e87521e6654aadcc2cef8e3f2b1 100644 (file)
--- a/contrib/utils/wxrcedit/propedit.h
+++ b/contrib/utils/wxrcedit/propedit.h
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "propedit.h"
 #endif
 
@@ -15,12 +15,12 @@
 #define _PROPEDIT_H_
 
 #include "wx/panel.h"
-#include "wx/generic/treectlg.h"
+#include "wx/treectrl.h"
 #include "nodesdb.h"
 #include "propframe.h"
 
 class WXDLLEXPORT wxXmlNode;
-class WXDLLEXPORT wxGenericTreeCtrl;
+class WXDLLEXPORT wxTreeCtrl;
 class WXDLLEXPORT wxTextCtrl;
 
 
@@ -61,7 +61,7 @@ class PropEditCtrl : public wxPanel
     
         PropertiesFrame *m_PropFrame;
         bool m_Created;
-        wxGenericTreeCtrl *m_TreeCtrl;
+        wxTreeCtrl *m_TreeCtrl;
         wxTreeItemId m_TreeItem;
         wxWindow *m_TheCtrl;
         PropertyInfo *m_PropInfo;