Removal of second part of dsw files (as requested by Jamie Gadd).

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

diff --git a/contrib/samples/ogl/studio/dialogs.h b/contrib/samples/ogl/studio/dialogs.h
index 4a97f8fc755699e5dc1151143ccedc5984317a31..10622f43a3567aa53769850d9b8038d28e0b51f4 100644 (file)
--- a/contrib/samples/ogl/studio/dialogs.h
+++ b/contrib/samples/ogl/studio/dialogs.h
@@ -1,23 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialogs.h
+// Name:        contrib/samples/ogl/studio/dialogs.h
 // Purpose:     Miscellaneous dialogs
 // Author:      Julian Smart
 // Modified by:
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _STUDIO_DIALOGS_H_
 #define _STUDIO_DIALOGS_H_
 
-#ifdef __GNUG__
-// #pragma interface
-#endif
+#include "wx/wx.h"
+#include "wx/notebook.h"
+
+#include "wx/ogl/ogl.h" // base header of OGL, includes and adjusts wx/deprecated/setup.h
 
-#include <wx/wx.h>
-#include <wx/notebook.h>
+#if wxUSE_WX_RESOURCES
 
 /*
  * Label editing dialog (about to become obsolete)
@@ -103,7 +103,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 +122,8 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
+#endif // wxUSE_WX_RESOURCES
+
 #define ID_SHAPE_PROPERTY_NOTEBOOK    1000
 
 //// Specific attribute-editing panel classes below here
@@ -243,6 +245,5 @@ public:
 DECLARE_EVENT_TABLE()
 };
 
-
 #endif
     // _STUDIO_DIALOGS_H_