Changed version number

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

diff --git a/contrib/utils/wxrcedit/pe_adv.h b/contrib/utils/wxrcedit/pe_adv.h
index f99c1b726ede97a1c3e4b57973e1d854ecbbd26d..6115554d16de4410eda680d1987c9b28cb011fee 100644 (file)
--- a/contrib/utils/wxrcedit/pe_adv.h
+++ b/contrib/utils/wxrcedit/pe_adv.h
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

     #pragma interface "pe_adv.h"
 #endif
 
     #pragma interface "pe_adv.h"
 #endif
 


@@ -25,7 +25,7 @@ class PropEditCtrlFont : public PropEditCtrlTxt
     public:
         PropEditCtrlFont(PropertiesFrame *propFrame)
            : PropEditCtrlTxt(propFrame) {}
     public:
         PropEditCtrlFont(PropertiesFrame *propFrame)
            : PropEditCtrlTxt(propFrame) {}

-                
+

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


@@ -37,12 +37,12 @@ class PropEditCtrlChoice : public PropEditCtrl
     public:
         PropEditCtrlChoice(PropertiesFrame *propFrame)
            : PropEditCtrl(propFrame) {}
     public:
         PropEditCtrlChoice(PropertiesFrame *propFrame)
            : PropEditCtrl(propFrame) {}

-                
+

         virtual wxWindow* CreateEditCtrl();
         virtual wxWindow* CreateEditCtrl();

-        
+

         virtual void ReadValue();
         virtual void WriteValue();
         virtual void ReadValue();
         virtual void WriteValue();

-    
+

     protected:
         wxChoice *m_Choice;
 
     protected:
         wxChoice *m_Choice;
 


@@ -57,7 +57,7 @@ class PropEditCtrlColor : public PropEditCtrlTxt
         PropEditCtrlColor(PropertiesFrame *propFrame)
             : PropEditCtrlTxt(propFrame) {}
 
         PropEditCtrlColor(PropertiesFrame *propFrame)
             : PropEditCtrlTxt(propFrame) {}
 

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

         virtual void OnDetails();
 };
 
         virtual void OnDetails();
 };
 


@@ -70,12 +70,32 @@ class PropEditCtrlFlags : public PropEditCtrlTxt
         PropEditCtrlFlags(PropertiesFrame *propFrame)
             : PropEditCtrlTxt(propFrame) {}
 
         PropEditCtrlFlags(PropertiesFrame *propFrame)
             : PropEditCtrlTxt(propFrame) {}
 

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

         virtual void OnDetails();
 };
 
 
 
         virtual void OnDetails();
 };
 
 
 

+class PropEditCtrlFile : public PropEditCtrlTxt
+{
+    public:
+        PropEditCtrlFile(PropertiesFrame *propFrame)
+            : PropEditCtrlTxt(propFrame) {}
+
+        virtual bool HasDetails() { return true; }
+        virtual void OnDetails();
+
+        virtual wxString GetFileTypes();
+};
+
+
+class PropEditCtrlImageFile : public PropEditCtrlFile
+{
+    public:
+        PropEditCtrlImageFile(PropertiesFrame *propFrame)
+            : PropEditCtrlFile(propFrame) {}

 
 

+        virtual wxString GetFileTypes();
+};

 
 #endif
 
 #endif