[ 1176516 ] argv datatype has changed (char in docs but really wxChar)

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

diff --git a/contrib/utils/wxrcedit/propedit.h b/contrib/utils/wxrcedit/propedit.h
index b74371604e1e93b801c5aaa3666bb6048f018f64..d1197cb0e2deb06808c98e7f317eab747a12a89e 100644 (file)
--- a/contrib/utils/wxrcedit/propedit.h
+++ b/contrib/utils/wxrcedit/propedit.h
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

     #pragma interface "propedit.h"
 #endif
 
     #pragma interface "propedit.h"
 #endif
 


@@ -29,45 +29,45 @@ class PropEditCtrl : public wxPanel
 {
     public:
         PropEditCtrl(PropertiesFrame *propFrame)
 {
     public:
         PropEditCtrl(PropertiesFrame *propFrame)

-           : wxPanel(propFrame->m_valueWindow, -1),
-             m_PropFrame(propFrame), m_Created(FALSE), m_TreeCtrl(propFrame->m_tree) 
-             {Show(FALSE);}
-                
+           : wxPanel(propFrame->m_valueWindow, wxID_ANY),
+             m_PropFrame(propFrame), m_Created(false), m_TreeCtrl(propFrame->m_tree)
+             {Show(false);}
+

         virtual void BeginEdit(const wxRect& rect, wxTreeItemId ti);
         virtual void EndEdit();
         virtual void BeginEdit(const wxRect& rect, wxTreeItemId ti);
         virtual void EndEdit();

-        
+

         virtual wxTreeItemId CreateTreeEntry(wxTreeItemId parent, const PropertyInfo& pinfo);
         virtual wxWindow* CreateEditCtrl() = 0;
         virtual wxTreeItemId CreateTreeEntry(wxTreeItemId parent, const PropertyInfo& pinfo);
         virtual wxWindow* CreateEditCtrl() = 0;

-        
+

         virtual bool IsPresent(const PropertyInfo& pinfo);
         virtual bool IsPresent(const PropertyInfo& pinfo);

-        
+

         virtual void Clear();
         virtual void ReadValue() = 0;
         virtual void WriteValue() = 0;
         virtual wxString GetValueAsText(wxTreeItemId ti);
         virtual wxString GetPropName(const PropertyInfo& pinfo)
                 { return pinfo.Name.AfterLast(_T('/')); }
         virtual void Clear();
         virtual void ReadValue() = 0;
         virtual void WriteValue() = 0;
         virtual wxString GetValueAsText(wxTreeItemId ti);
         virtual wxString GetPropName(const PropertyInfo& pinfo)
                 { return pinfo.Name.AfterLast(_T('/')); }

-        
-        virtual bool HasDetails() { return FALSE; }
+
+        virtual bool HasDetails() { return false; }

         virtual void OnDetails() {}
         virtual void OnDetails() {}

-        virtual bool HasClearButton() { return TRUE; }
-        
+        virtual bool HasClearButton() { return true; }
+

         void OnButtonDetails(wxCommandEvent& event);
         void OnButtonClear(wxCommandEvent& event);
         void OnButtonDetails(wxCommandEvent& event);
         void OnButtonClear(wxCommandEvent& event);

-    
+

     protected:
         wxXmlNode *GetNode() { return m_PropFrame->m_Node; }
         bool CanSave() { return m_CanSave; }
     protected:
         wxXmlNode *GetNode() { return m_PropFrame->m_Node; }
         bool CanSave() { return m_CanSave; }

-    
+

         PropertiesFrame *m_PropFrame;
         bool m_Created;
         wxTreeCtrl *m_TreeCtrl;
         wxTreeItemId m_TreeItem;
         wxWindow *m_TheCtrl;
         PropertyInfo *m_PropInfo;
         PropertiesFrame *m_PropFrame;
         bool m_Created;
         wxTreeCtrl *m_TreeCtrl;
         wxTreeItemId m_TreeItem;
         wxWindow *m_TheCtrl;
         PropertyInfo *m_PropInfo;

-        
+

         bool m_CanSave;
         bool m_CanSave;

-        
+

         DECLARE_EVENT_TABLE()
 };
 
         DECLARE_EVENT_TABLE()
 };
 


@@ -76,7 +76,7 @@ class PropEditCtrl : public wxPanel
 class PETreeData : public wxTreeItemData
 {
     public:
 class PETreeData : public wxTreeItemData
 {
     public:

-        PETreeData(PropEditCtrl *p, const PropertyInfo& pi) : 
+        PETreeData(PropEditCtrl *p, const PropertyInfo& pi) :

                 wxTreeItemData(),
                 EditCtrl(p), PropInfo(pi) {}
         PropEditCtrl *EditCtrl;
                 wxTreeItemData(),
                 EditCtrl(p), PropInfo(pi) {}
         PropEditCtrl *EditCtrl;