Elliptic arc fix for getting bounds

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

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

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

     #pragma interface "pe_basic.h"
 #endif
 
     #pragma interface "pe_basic.h"
 #endif
 


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

-                
-        virtual void BeginEdit(const wxRect& rect, wxTreeItemId ti) {}
+
+        virtual void BeginEdit(const wxRect& WXUNUSED(rect), wxTreeItemId WXUNUSED(ti)) {}

         virtual void EndEdit() {}
         virtual void EndEdit() {}

-                
+

         virtual wxWindow* CreateEditCtrl() {return NULL;}
         virtual wxWindow* CreateEditCtrl() {return NULL;}

-        
+

         virtual void ReadValue() {}
         virtual void WriteValue() {}
 };
         virtual void ReadValue() {}
         virtual void WriteValue() {}
 };


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

-                
+

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

-        
+

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

-        
+

     protected:
         wxTextCtrl *m_TextCtrl;
 
     protected:
         wxTextCtrl *m_TextCtrl;
 


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

-                
+

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


@@ -74,13 +74,13 @@ class PropEditCtrlBool : public PropEditCtrl
     public:
         PropEditCtrlBool(PropertiesFrame *propFrame)
            : PropEditCtrl(propFrame) {}
     public:
         PropEditCtrlBool(PropertiesFrame *propFrame)
            : PropEditCtrl(propFrame) {}

-                
+

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

-        
+

         virtual void ReadValue();
         virtual void WriteValue();
         virtual wxString GetValueAsText(wxTreeItemId ti);
         virtual void ReadValue();
         virtual void WriteValue();
         virtual wxString GetValueAsText(wxTreeItemId ti);

-    
+

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


@@ -94,9 +94,9 @@ class PropEditCtrlCoord : public PropEditCtrlTxt
     public:
         PropEditCtrlCoord(PropertiesFrame *propFrame);
         ~PropEditCtrlCoord();
     public:
         PropEditCtrlCoord(PropertiesFrame *propFrame);
         ~PropEditCtrlCoord();

-    
+

         virtual wxTreeItemId CreateTreeEntry(wxTreeItemId parent, const PropertyInfo& pinfo);
         virtual wxTreeItemId CreateTreeEntry(wxTreeItemId parent, const PropertyInfo& pinfo);

-        
+

     private:
         PropEditCtrl *m_CtrlX, *m_CtrlY, *m_CtrlDlg;
 };
     private:
         PropEditCtrl *m_CtrlX, *m_CtrlY, *m_CtrlDlg;
 };


@@ -107,25 +107,25 @@ class PropEditCtrlDim : public PropEditCtrlTxt
     public:
         PropEditCtrlDim(PropertiesFrame *propFrame);
         ~PropEditCtrlDim();
     public:
         PropEditCtrlDim(PropertiesFrame *propFrame);
         ~PropEditCtrlDim();

-    
+

         virtual wxTreeItemId CreateTreeEntry(wxTreeItemId parent, const PropertyInfo& pinfo);
         virtual wxTreeItemId CreateTreeEntry(wxTreeItemId parent, const PropertyInfo& pinfo);

-        
+

     private:
         PropEditCtrl *m_CtrlX, *m_CtrlDlg;
 };
 
 
 
     private:
         PropEditCtrl *m_CtrlX, *m_CtrlDlg;
 };
 
 
 

-class PropEditCtrlXMLID : public PropEditCtrlTxt
+class PropEditCtrlXRCID : public PropEditCtrlTxt

 {
     public:
 {
     public:

-        PropEditCtrlXMLID(PropertiesFrame *propFrame)
+        PropEditCtrlXRCID(PropertiesFrame *propFrame)

            : PropEditCtrlTxt(propFrame) {}
            : PropEditCtrlTxt(propFrame) {}

-                
+

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

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

         virtual void OnDetails();
         virtual wxString GetValueAsText(wxTreeItemId ti);
         virtual bool IsPresent(const PropertyInfo& pinfo);
         virtual void OnDetails();
         virtual wxString GetValueAsText(wxTreeItemId ti);
         virtual bool IsPresent(const PropertyInfo& pinfo);