wxUSE_STL fixes.

[wxWidgets.git] / contrib / samples / ogl / studio / view.h

diff --git a/contrib/samples/ogl/studio/view.h b/contrib/samples/ogl/studio/view.h
index 9b15ec43457e7339aa787c32faa4744c66c78e8e..f7fc263d71b9bdc195e4254707aa22f0e2565643 100644 (file)
--- a/contrib/samples/ogl/studio/view.h
+++ b/contrib/samples/ogl/studio/view.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _STUDIO_VIEW_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _STUDIO_VIEW_H_


@@ -25,7 +25,7 @@ class csCanvas: public wxShapeCanvas
 DECLARE_CLASS(csCanvas)
  public:
 
 DECLARE_CLASS(csCanvas)
  public:
 

-  csCanvas(csDiagramView *view, wxWindow *parent = NULL, wxWindowID id = -1,
+  csCanvas(csDiagramView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY,

             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxRETAINED);
   ~csCanvas(void);
             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxRETAINED);
   ~csCanvas(void);


@@ -65,7 +65,7 @@ class csDiagramView: public wxView
   bool OnCreate(wxDocument *doc, long flags);
   void OnDraw(wxDC *dc);
   void OnUpdate(wxView *sender, wxObject *hint = NULL);
   bool OnCreate(wxDocument *doc, long flags);
   void OnDraw(wxDC *dc);
   void OnUpdate(wxView *sender, wxObject *hint = NULL);

-  bool OnClose(bool deleteWindow = TRUE);
+  bool OnClose(bool deleteWindow = true);

   void OnSelectAll(wxCommandEvent& event);
 
   wxShape *FindFirstSelectedShape(void);
   void OnSelectAll(wxCommandEvent& event);
 
   wxShape *FindFirstSelectedShape(void);


@@ -95,7 +95,7 @@ class csDiagramView: public wxView
   void DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxString& op);
 
   // Select or deselect all
   void DoCmd(wxList& shapes, wxList& oldShapes, int cmd, const wxString& op);
 
   // Select or deselect all

-  void SelectAll(bool select = TRUE);
+  void SelectAll(bool select = true);

 
 // Event handlers
   void OnCut(wxCommandEvent& event);
 
 // Event handlers
   void OnCut(wxCommandEvent& event);