Removed every usage of obsolete wxTLW flags. 2.6 compatibility markup for them.

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

diff --git a/contrib/samples/ogl/ogledit/view.h b/contrib/samples/ogl/ogledit/view.h
index 388a22dc060bc004591b96cf9004bd00d788e838..363696eb0eb764162bbf4a96655aaf0ae3aa0e25 100644 (file)
--- a/contrib/samples/ogl/ogledit/view.h
+++ b/contrib/samples/ogl/ogledit/view.h
@@ -1,23 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        view.h
+// Name:        contrib/samples/ogl/ogledit/view.h

 // Purpose:     View-related classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     View-related classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGLSAMPLE_VIEW_H_
 #define _OGLSAMPLE_VIEW_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGLSAMPLE_VIEW_H_
 #define _OGLSAMPLE_VIEW_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-// #pragma interface "view.h"
-#endif
-

 #include "doc.h"
 #include "doc.h"

-#include <wx/ogl/ogl.h>
+#include "wx/ogl/ogl.h"

 
 class MyCanvas: public wxShapeCanvas
 {
 
 class MyCanvas: public wxShapeCanvas
 {


@@ -26,7 +22,7 @@ class MyCanvas: public wxShapeCanvas
  public:
   wxView *view;
 
  public:
   wxView *view;
 

-  MyCanvas(wxView *view, wxWindow *parent = NULL, wxWindowID id = -1,
+  MyCanvas(wxView *view, wxWindow *parent = NULL, wxWindowID id = wxID_ANY,

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


@@ -55,19 +51,17 @@ class DiagramView: public wxView
  public:
   wxFrame *frame;
   MyCanvas *canvas;
  public:
   wxFrame *frame;
   MyCanvas *canvas;

-  
+

   DiagramView(void) { canvas = NULL; frame = NULL; };
   ~DiagramView(void) {};
 
   bool OnCreate(wxDocument *doc, long flags);
   void OnDraw(wxDC *dc);
   void OnUpdate(wxView *sender, wxObject *hint = NULL);
   DiagramView(void) { canvas = NULL; frame = NULL; };
   ~DiagramView(void) {};
 
   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);

 
   wxShape *FindSelectedShape(void);
 
 
   wxShape *FindSelectedShape(void);
 

-//  void OnMenuCommand(int cmd);
-

   void OnCut(wxCommandEvent& event);
   void OnChangeBackgroundColour(wxCommandEvent& event);
   void OnEditLabel(wxCommandEvent& event);
   void OnCut(wxCommandEvent& event);
   void OnChangeBackgroundColour(wxCommandEvent& event);
   void OnEditLabel(wxCommandEvent& event);