use default position, not 0, 0

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

diff --git a/contrib/utils/wxrcedit/nodesdb.h b/contrib/utils/wxrcedit/nodesdb.h
index ff629f0d1dcfeb84a7c8b94aae158cf46bc1bc34..6c328a0e7985621b0a9229377766956b77f57ea1 100644 (file)
--- a/contrib/utils/wxrcedit/nodesdb.h
+++ b/contrib/utils/wxrcedit/nodesdb.h
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

     #pragma interface "nodesdb.h"
 #endif
 
     #pragma interface "nodesdb.h"
 #endif
 


@@ -15,6 +15,7 @@
 #define _NODESDB_H_
 
 #include "wx/dynarray.h"
 #define _NODESDB_H_
 
 #include "wx/dynarray.h"

+#include "wx/arrstr.h"

 
 class WXDLLEXPORT wxXmlNode;
 class WXDLLEXPORT wxString;
 
 class WXDLLEXPORT wxXmlNode;
 class WXDLLEXPORT wxString;


@@ -27,13 +28,13 @@ class PropertyInfo
         PropertyInfo() {}
         PropertyInfo(const wxString& atype, const wxString& aname, const wxString& amoreinfo)
           : Type(atype), Name(aname), MoreInfo(amoreinfo) {}
         PropertyInfo() {}
         PropertyInfo(const wxString& atype, const wxString& aname, const wxString& amoreinfo)
           : Type(atype), Name(aname), MoreInfo(amoreinfo) {}

-       
+

         PropertyInfo& operator=(const PropertyInfo& p)
         {
             Type = p.Type; Name = p.Name; MoreInfo = p.MoreInfo;
             return *this;
         }
         PropertyInfo& operator=(const PropertyInfo& p)
         {
             Type = p.Type; Name = p.Name; MoreInfo = p.MoreInfo;
             return *this;
         }

-       
+

         wxString Type;
         wxString Name;
         wxString MoreInfo;
         wxString Type;
         wxString Name;
         wxString MoreInfo;


@@ -46,13 +47,13 @@ class NodeInfo
 {
     public:
         wxString NodeClass;
 {
     public:
         wxString NodeClass;

-        wxString Type;   
+        wxString Type;

         PropertyInfoArray Props;
         wxArrayString DerivedFrom;
         bool Abstract;
         wxString ChildType;
         int Icon;
         PropertyInfoArray Props;
         wxArrayString DerivedFrom;
         bool Abstract;
         wxString ChildType;
         int Icon;

-    
+

         void Read(const wxString& filename, wxPathList& list);
 };
 
         void Read(const wxString& filename, wxPathList& list);
 };
 


@@ -64,15 +65,15 @@ class NodesDb
 {
     public:
         NodesDb();
 {
     public:
         NodesDb();

-    
+

         void Load();
         void LoadDir(const wxString& path);
         void LoadFile(const wxString& file);
         void Load();
         void LoadDir(const wxString& path);
         void LoadFile(const wxString& file);

-        
+

         NodeInfoArray& GetNodesInfo() { return m_Infos; }
         NodeInfoArray& GetNodesInfo() { return m_Infos; }

-    
+

         static NodesDb *Get();
         static NodesDb *Get();

-    
+

     private:
         static NodesDb *ms_Instance;
         NodeInfoArray m_Infos;
     private:
         static NodesDb *ms_Instance;
         NodeInfoArray m_Infos;


@@ -81,4 +82,4 @@ class NodesDb
 
 
 
 
 
 

-#endif 
+#endif