Document wxTextCtrl::XYToPosition, PositionToXY and GetLineLength change

[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 69fedf280cabf6482d8b4c5568e7eeb5978460a7..5db3a457287547b5424cd386b8b051875192c18c 100644 (file)
--- a/contrib/samples/ogl/studio/dialogs.h
+++ b/contrib/samples/ogl/studio/dialogs.h
@@ -19,6 +19,10 @@
 #include <wx/wx.h>
 #include <wx/notebook.h>
 
 #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)
  */
 /*
  * 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();
     // 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; }
 
 // Accessors
     csGeneralShapePropertiesDialog* GetGeneralPropertiesDialog() const { return m_generalPropertiesDialog; }
 


@@ -122,6 +126,8 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

+#endif // wxUSE_WX_RESOURCES
+

 #define ID_SHAPE_PROPERTY_NOTEBOOK    1000
 
 //// Specific attribute-editing panel classes below here
 #define ID_SHAPE_PROPERTY_NOTEBOOK    1000
 
 //// Specific attribute-editing panel classes below here


@@ -243,6 +249,5 @@ public:
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

-

 #endif
     // _STUDIO_DIALOGS_H_
 #endif
     // _STUDIO_DIALOGS_H_