fixed resize line drawing

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

diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h
index 56e17c1adfa9f48a2708a75b86824848e750dea4..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"


@@ -26,6 +26,7 @@
 #include "wx/imaglist.h"
 #include "wx/treectrl.h"
 #include "wx/proplist.h"
 #include "wx/imaglist.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"
 


@@ -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, wxItemResource* parentItem);
+  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,7 +145,7 @@ 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, const wxFont& font);
+  void OutputFont(wxTextOutputStream& stream, const wxFont& font);

   wxControl *CreateItem(wxPanel *panel, const wxItemResource *childResource, const wxItemResource* parentResource);
 
 protected:
   wxControl *CreateItem(wxPanel *panel, const wxItemResource *childResource, const wxItemResource* parentResource);
 
 protected:


@@ -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);