X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab7ce33c563651f790f99d64ee56727706047ae3..ebef1625fa59c555e45d2aa278de0ff5674d6142:/contrib/samples/ogl/studio/dialogs.h diff --git a/contrib/samples/ogl/studio/dialogs.h b/contrib/samples/ogl/studio/dialogs.h index 69fedf280c..da46fb7145 100644 --- a/contrib/samples/ogl/studio/dialogs.h +++ b/contrib/samples/ogl/studio/dialogs.h @@ -12,13 +12,13 @@ #ifndef _STUDIO_DIALOGS_H_ #define _STUDIO_DIALOGS_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -// #pragma interface -#endif - #include #include +#include // base header of OGL, includes and adjusts wx/deprecated/setup.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_