corrected version number extraction

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

diff --git a/contrib/utils/wxrcedit/propframe.h b/contrib/utils/wxrcedit/propframe.h
index 6a9595850047ace1d8c0000488dee9fcec953dd2..4cb6bcb437654c85056c9d1443e993928a5361c5 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
 


@@ -27,15 +27,15 @@ class PropertiesFrame : public wxFrame
     public:
         PropertiesFrame();
         ~PropertiesFrame();
     public:
         PropertiesFrame();
         ~PropertiesFrame();

-        
+

         void ShowProps(wxXmlNode *node);
         void ShowProps(wxXmlNode *node);

-        
+

         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();

-           
+

     private:
 
         static PropertiesFrame *ms_Instance;
     private:
 
         static PropertiesFrame *ms_Instance;


@@ -43,11 +43,11 @@ class PropertiesFrame : public wxFrame
 
         wxRemotelyScrolledTreeCtrl *m_tree;
         wxThinSplitterWindow *m_splitter;
 
         wxRemotelyScrolledTreeCtrl *m_tree;
         wxThinSplitterWindow *m_splitter;

-           wxSplitterScrolledWindow *m_scrolledWindow;
+        wxSplitterScrolledWindow *m_scrolledWindow;

         wxTreeCompanionWindow *m_valueWindow;
         wxTreeCompanionWindow *m_valueWindow;

-        
+

         wxHashTable m_EditCtrls;
         wxHashTable m_EditCtrls;

-        
+

         friend class PropEditCtrl;
 };
 
         friend class PropEditCtrl;
 };