X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0fff5cb110810d3bee6fa255292f161f7752911..f3033278722328d37b98406b45060a2a3b8b1877:/utils/dialoged/src/reseditr.h

diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h
index 8b8af13ad2..5a87b10d06 100644
--- a/utils/dialoged/src/reseditr.h
+++ b/utils/dialoged/src/reseditr.h
@@ -24,8 +24,8 @@
 #include "wx/resource.h"
 #include "wx/toolbar.h"
 #include "wx/imaglist.h"
-
-#include "proplist.h"
+#include "wx/treectrl.h"
+#include "wx/proplist.h"
 #include "symbtabl.h"
 #include "winstyle.h"
 
@@ -117,7 +117,7 @@ class wxResourceTableWithSaving: public wxResourceTable
     m_styleTable.Init();
   }
   virtual bool Save(const wxString& filename);
-  virtual bool SaveResource(ostream& stream, wxItemResource *item);
+  virtual bool SaveResource(ostream& stream, wxItemResource* item, wxItemResource* parentItem);
 
   void GeneratePanelStyleString(long windowStyle, char *buf);
   void GenerateDialogStyleString(long windowStyle, char *buf);
@@ -144,8 +144,8 @@ class wxResourceTableWithSaving: public wxResourceTable
   bool GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle);
 */
 
-  void OutputFont(ostream& stream, wxFont *font);
-  wxControl *CreateItem(wxPanel *panel, wxItemResource *childResource);
+  void OutputFont(ostream& stream, const wxFont& font);
+  wxControl *CreateItem(wxPanel *panel, const wxItemResource *childResource, const wxItemResource* parentResource);
 
 protected:
   wxWindowStyleTable    m_styleTable;
@@ -219,17 +219,17 @@ public:
    virtual bool DeleteResource(wxWindow *win);
 
    // Add bitmap resource if there isn't already one with this filename.
-   virtual char *AddBitmapResource(char *filename);
+   virtual wxString AddBitmapResource(const wxString& filename);
 
    // Delete the bitmap resource if it isn't being used by another resource.
-   virtual void PossiblyDeleteBitmapResource(char *resourceName);
+   virtual void PossiblyDeleteBitmapResource(const wxString& resourceName);
 
    // Helper function for above
-   virtual bool IsBitmapResourceUsed(char *resourceName);
+   virtual bool IsBitmapResourceUsed(const wxString& resourceName);
 
-   wxItemResource *FindBitmapResourceByFilename(char *filename);
+   wxItemResource *FindBitmapResourceByFilename(const wxString& filename);
 
-   char *FindBitmapFilenameForResource(wxItemResource *resource);
+   wxString FindBitmapFilenameForResource(wxItemResource *resource);
 
    // Is this window identifier in use?
    bool IsSymbolUsed(wxItemResource* thisResource, wxWindowID id) ;
@@ -357,7 +357,7 @@ class wxResourceEditorFrame: public wxFrame
     long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
   ~wxResourceEditorFrame();
 
-  bool OnClose();
+  void OnCloseWindow(wxCloseEvent& event);
 
   void OnNew(wxCommandEvent& event);
   void OnOpen(wxCommandEvent& event);
@@ -437,5 +437,19 @@ DECLARE_EVENT_TABLE()
 #define TOOLBAR_TO_BACK                     17
 #define TOOLBAR_COPY_SIZE                   18
 
+/*
+ * this class is used to store data associated with a tree item
+ */
+class wxResourceTreeData : public wxTreeItemData
+{
+public:
+    wxResourceTreeData(wxItemResource *resource) { m_resource = resource; }
+
+    wxItemResource *GetResource() const { return m_resource; }
+
+private:
+    wxItemResource *m_resource;
+};
+
 #endif