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/dialogs.h

@@ -19,6 +19,10 @@
 #include <wx/wx.h>
 #include <wx/notebook.h>
 
+#include <wx/ogl/ogl.h> // base header of OGL, includes and adjusts wx/deprecated/setup.h
+
+#if wxUSE_WX_RESOURCES
+
 /*
  * Label editing dialog (about to become obsolete)
  */
@@ -103,7 +107,7 @@ public:
     // Set some suitable defaults in the attribute dialogs (in the first instance,
     // just set all wxChoices to the first element)
     void SetDefaults();
-    
+
 // Accessors
     csGeneralShapePropertiesDialog* GetGeneralPropertiesDialog() const { return m_generalPropertiesDialog; }
 
@@ -122,6 +126,8 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
+#endif // wxUSE_WX_RESOURCES
+
 #define ID_SHAPE_PROPERTY_NOTEBOOK    1000
 
 //// Specific attribute-editing panel classes below here
@@ -243,6 +249,5 @@ public:
 DECLARE_EVENT_TABLE()
 };
 
-
 #endif
     // _STUDIO_DIALOGS_H_