X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12d9e30820444b48882ab9e29139611b99a84495..209f3e1453dd576919bf1cc8f696218dae23c34b:/contrib/utils/wxrcedit/propframe.h?ds=inline diff --git a/contrib/utils/wxrcedit/propframe.h b/contrib/utils/wxrcedit/propframe.h index 6a95958500..4cb6bcb437 100644 --- a/contrib/utils/wxrcedit/propframe.h +++ b/contrib/utils/wxrcedit/propframe.h @@ -7,7 +7,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "propframe.h" #endif @@ -27,15 +27,15 @@ class PropertiesFrame : public wxFrame public: PropertiesFrame(); ~PropertiesFrame(); - + void ShowProps(wxXmlNode *node); - + void ClearProps(); void AddProps(PropertyInfoArray& plist); - void AddSingleProp(const PropertyInfo& pinfo); - + void AddSingleProp(const PropertyInfo& pinfo, wxTreeItemId *root = NULL); + static PropertiesFrame *Get(); - + private: static PropertiesFrame *ms_Instance; @@ -43,11 +43,11 @@ class PropertiesFrame : public wxFrame wxRemotelyScrolledTreeCtrl *m_tree; wxThinSplitterWindow *m_splitter; - wxSplitterScrolledWindow *m_scrolledWindow; + wxSplitterScrolledWindow *m_scrolledWindow; wxTreeCompanionWindow *m_valueWindow; - + wxHashTable m_EditCtrls; - + friend class PropEditCtrl; };