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/studio/doc.h

@@ -20,16 +20,14 @@
 #include <wx/cmdproc.h>
 #include <wx/string.h>
 
-#include <wx/deprecated/setup.h>
-#include <wx/deprecated/wxexpr.h>
+#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
 
-#include <wx/ogl/ogl.h>
 #include "shapes.h"
 
 /*
  * A diagram document, which contains a diagram.
  */
- 
+
 class csDiagramDocument: public wxDocument
 {
   DECLARE_DYNAMIC_CLASS(csDiagramDocument)
@@ -37,11 +35,13 @@ public:
   csDiagramDocument();
   ~csDiagramDocument();
 
+#if wxUSE_PROLOGIO
   bool OnSaveDocument(const wxString& file);
   bool OnOpenDocument(const wxString& file);
-  
+#endif // wxUSE_PROLOGIO
+
   inline wxDiagram *GetDiagram() { return &m_diagram; }
-  
+
   bool OnCloseDocument();
 
 protected:
@@ -71,7 +71,7 @@ protected:
 
  */
 
-  
+
 class csCommandState;
 class csDiagramCommand: public wxCommand
 {