wx-config is configurable...

[wxWidgets.git] / utils / dialoged / src / reseditr.h

diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h
index 4af3085bb79a9c5f9c7dc0264876859bd48742f6..021b867195d90e0dc36bc5e1d6aa9aa970754900 100644 (file)
--- a/utils/dialoged/src/reseditr.h
+++ b/utils/dialoged/src/reseditr.h
@@ -12,7 +12,7 @@
 #ifndef _RESEDITR_H_
 #define _RESEDITR_H_
 
 #ifndef _RESEDITR_H_
 #define _RESEDITR_H_
 

-#define wxDIALOG_EDITOR_VERSION 1.6
+#define wxDIALOG_EDITOR_VERSION 1.7

 
 #ifdef __GNUG__
 #pragma interface "reseditr.h"
 
 #ifdef __GNUG__
 #pragma interface "reseditr.h"


@@ -24,8 +24,9 @@
 #include "wx/resource.h"
 #include "wx/toolbar.h"
 #include "wx/imaglist.h"
 #include "wx/resource.h"
 #include "wx/toolbar.h"
 #include "wx/imaglist.h"

-
-#include "proplist.h"
+#include "wx/treectrl.h"
+#include "wx/proplist.h"
+#include "wx/txtstrm.h"

 #include "symbtabl.h"
 #include "winstyle.h"
 
 #include "symbtabl.h"
 #include "winstyle.h"
 


@@ -76,7 +77,7 @@ class wxResourceEditorControlList;
 #ifdef __WXMSW__
 #define wxHelpController wxWinHelpController
 #else
 #ifdef __WXMSW__
 #define wxHelpController wxWinHelpController
 #else

-#define wxHelpController wxXLPHelpController;
+#define wxHelpController wxHTMLHelpController;

 #endif
 
 class wxHelpController;
 #endif
 
 class wxHelpController;


@@ -117,7 +118,7 @@ class wxResourceTableWithSaving: public wxResourceTable
     m_styleTable.Init();
   }
   virtual bool Save(const wxString& filename);
     m_styleTable.Init();
   }
   virtual bool Save(const wxString& filename);

-  virtual bool SaveResource(ostream& stream, wxItemResource *item);
+  virtual bool SaveResource(wxTextOutputStream& stream, wxItemResource* item, wxItemResource* parentItem);

 
   void GeneratePanelStyleString(long windowStyle, char *buf);
   void GenerateDialogStyleString(long windowStyle, char *buf);
 
   void GeneratePanelStyleString(long windowStyle, char *buf);
   void GenerateDialogStyleString(long windowStyle, char *buf);


@@ -144,8 +145,8 @@ class wxResourceTableWithSaving: public wxResourceTable
   bool GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle);
 */
 
   bool GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle);
 */
 

-  void OutputFont(ostream& stream, wxFont *font);
-  wxControl *CreateItem(wxPanel *panel, wxItemResource *childResource);
+  void OutputFont(wxTextOutputStream& stream, const wxFont& font);
+  wxControl *CreateItem(wxPanel *panel, const wxItemResource *childResource, const wxItemResource* parentResource);

 
 protected:
   wxWindowStyleTable    m_styleTable;
 
 protected:
   wxWindowStyleTable    m_styleTable;


@@ -219,17 +220,17 @@ public:
    virtual bool DeleteResource(wxWindow *win);
 
    // Add bitmap resource if there isn't already one with this filename.
    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.
 
    // 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
 
    // 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) ;
 
    // Is this window identifier in use?
    bool IsSymbolUsed(wxItemResource* thisResource, wxWindowID id) ;


@@ -251,10 +252,13 @@ public:
    // Deletes 'win' and creates a new window from the resource that
    // was associated with it. E.g. if you can't change properties on the
    // fly, you'll need to delete the window and create it again.
    // Deletes 'win' and creates a new window from the resource that
    // was associated with it. E.g. if you can't change properties on the
    // fly, you'll need to delete the window and create it again.

-   virtual wxWindow *RecreateWindowFromResource(wxWindow *win, wxWindowPropertyInfo *info = NULL);
+   virtual wxWindow *RecreateWindowFromResource(wxWindow *win, wxWindowPropertyInfo *info = NULL, bool instantiateFirst = TRUE);

 
    virtual bool RecreateSelection();
 
 
    virtual bool RecreateSelection();
 

+   // Remove selection handles if this control is selected
+   void DeselectItemIfNecessary(wxWindow *win);
+

    // Need to search through resource table removing this from
    // any resource which has this as a parent.
    virtual bool RemoveResourceFromParent(wxItemResource *res);
    // Need to search through resource table removing this from
    // any resource which has this as a parent.
    virtual bool RemoveResourceFromParent(wxItemResource *res);


@@ -286,7 +290,9 @@ public:
    inline wxResourceEditorControlList *GetEditorControlList() const { return m_editorControlList; }
    inline wxList& GetSelections() { return m_selections; }
    inline wxMenu *GetPopupMenu() const { return m_popupMenu; }
    inline wxResourceEditorControlList *GetEditorControlList() const { return m_editorControlList; }
    inline wxList& GetSelections() { return m_selections; }
    inline wxMenu *GetPopupMenu() const { return m_popupMenu; }

+#ifdef __WXMSW__

    inline wxHelpController *GetHelpController() const { return m_helpController; }
    inline wxHelpController *GetHelpController() const { return m_helpController; }

+#endif

 
    inline void Modify(bool mod = TRUE) { m_modified = mod; }
    inline bool Modified() const { return m_modified; }
 
    inline void Modify(bool mod = TRUE) { m_modified = mod; }
    inline bool Modified() const { return m_modified; }


@@ -310,7 +316,9 @@ public:
 
 // Member variables
  protected:
 
 // Member variables
  protected:

+#ifdef __WXMSW__

    wxHelpController*                m_helpController;
    wxHelpController*                m_helpController;

+#endif

    wxResourceTableWithSaving        m_resourceTable;
    wxFrame*                         m_editorFrame;
    wxResourceEditorScrolledWindow*  m_editorPanel;
    wxResourceTableWithSaving        m_resourceTable;
    wxFrame*                         m_editorFrame;
    wxResourceEditorScrolledWindow*  m_editorPanel;


@@ -353,7 +361,7 @@ class wxResourceEditorFrame: public wxFrame
     long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
   ~wxResourceEditorFrame();
 
     long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
   ~wxResourceEditorFrame();
 

-  bool OnClose();
+  void OnCloseWindow(wxCloseEvent& event);

 
   void OnNew(wxCommandEvent& event);
   void OnOpen(wxCommandEvent& event);
 
   void OnNew(wxCommandEvent& event);
   void OnOpen(wxCommandEvent& event);


@@ -378,7 +386,6 @@ class wxResourceEditorScrolledWindow: public wxScrolledWindow
       long style = 0);
   ~wxResourceEditorScrolledWindow();
 
       long style = 0);
   ~wxResourceEditorScrolledWindow();
 

-  void OnScroll(wxScrollEvent& event);

   void OnPaint(wxPaintEvent& event);
 
   void DrawTitle(wxDC& dc);
   void OnPaint(wxPaintEvent& event);
 
   void DrawTitle(wxDC& dc);


@@ -410,7 +417,6 @@ public:
             long style = wxTB_HORIZONTAL);
   bool OnLeftClick(int toolIndex, bool toggled);
   void OnMouseEnter(int toolIndex);
             long style = wxTB_HORIZONTAL);
   bool OnLeftClick(int toolIndex, bool toggled);
   void OnMouseEnter(int toolIndex);

-  void OnPaint(wxPaintEvent& event);

 
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };


@@ -434,5 +440,19 @@ DECLARE_EVENT_TABLE()
 #define TOOLBAR_TO_BACK                     17
 #define TOOLBAR_COPY_SIZE                   18
 
 #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
 
 #endif