added cmdline.h/.cpp to the makefiles

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

diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h
index 38634c1bfe2fbb30512ddf3e198fed3f748158e2..c0b2c6840b0471329c4690c07a2f57ff9fd7687b 100644 (file)
--- a/utils/dialoged/src/reseditr.h
+++ b/utils/dialoged/src/reseditr.h
@@ -25,8 +25,8 @@
 #include "wx/toolbar.h"
 #include "wx/imaglist.h"
 #include "wx/treectrl.h"
 #include "wx/toolbar.h"
 #include "wx/imaglist.h"
 #include "wx/treectrl.h"

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

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


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


@@ -145,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:


@@ -358,7 +358,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);


@@ -383,7 +383,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);