OGL samples again buildable after deprecated/setup.h turned off by default. Minor cleaning where applicable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/samples/ogl/ogledit/doc.h

@@ -20,7 +20,7 @@
 #include <wx/cmdproc.h>
 #include <wx/string.h>
 
-#include <wx/deprecated/setup.h>
+#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
 
 #if wxUSE_PROLOGIO
 #include <wx/deprecated/wxexpr.h>
@@ -35,7 +35,7 @@
 /*
  * Override a few members for this application
  */
- 
+
 class MyDiagram: public wxDiagram
 {
  public:
@@ -50,7 +50,7 @@ class MyDiagram: public wxDiagram
  * A few new shape classes so we have a 1:1 mapping
  * between palette symbol and unique class
  */
- 
+
 class wxRoundedRectangleShape: public wxRectangleShape
 {
   DECLARE_DYNAMIC_CLASS(wxRoundedRectangleShape)
@@ -71,7 +71,7 @@ class wxDiamondShape: public wxPolygonShape
  * All shape event behaviour is routed through this handler, so we don't
  * have to derive from each shape class. We plug this in to each shape.
  */
- 
+
 class MyEvtHandler: public wxShapeEvtHandler
 {
  public:
@@ -93,14 +93,14 @@ class MyEvtHandler: public wxShapeEvtHandler
 /*
  * A diagram document, which contains a diagram.
  */
- 
+
 class DiagramDocument: public wxDocument
 {
   DECLARE_DYNAMIC_CLASS(DiagramDocument)
  private:
  public:
   MyDiagram diagram;
-  
+
   DiagramDocument(void);
   ~DiagramDocument(void);
 
@@ -111,9 +111,9 @@ class DiagramDocument: public wxDocument
     virtual wxOutputStream& SaveObject(wxOutputStream& stream);
     virtual wxInputStream& LoadObject(wxInputStream& stream);
 #endif
-  
+
   inline wxDiagram *GetDiagram() { return &diagram; }
-  
+
   bool OnCloseDocument(void);
 };
 
@@ -142,7 +142,7 @@ class DiagramDocument: public wxDocument
  * Assume, as here, that we keep a pointer to the old shape so we reuse it
  * when we recreate.
  */
- 
+
 class DiagramCommand: public wxCommand
 {
  protected: