Fixed drawing of the lines data, also ensure that only tuples are

[wxWidgets.git] / utils / dialoged / src / reseditr.h

diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h
index 89d108e1e06380f182350c4a9d3ea20039892017..3b479472e5cbbde528299339f1aa615295630027 100644 (file)
--- a/utils/dialoged/src/reseditr.h
+++ b/utils/dialoged/src/reseditr.h
@@ -14,19 +14,23 @@
 
 #define wxDIALOG_EDITOR_VERSION 2.1
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "reseditr.h"
 #endif
 
+#include "wx/deprecated/setup.h"
+
 #include "wx/wx.h"
 #include "wx/string.h"
 #include "wx/layout.h"
-#include "wx/resource.h"
 #include "wx/toolbar.h"
 #include "wx/imaglist.h"
 #include "wx/treectrl.h"
-#include "wx/proplist.h"
 #include "wx/txtstrm.h"
+
+#include "wx/deprecated/resource.h"
+#include "wx/deprecated/proplist.h"
+
 #include "symbtabl.h"
 #include "winstyle.h"
 
@@ -182,7 +186,7 @@ public:
     virtual wxResourceEditorScrolledWindow *OnCreateEditorPanel(wxFrame *parent);
     virtual wxToolBar *OnCreateToolBar(wxFrame *parent);
     
-    // Create a window information object for the give window
+    // Create a window information object for the given window
     wxWindowPropertyInfo* CreatePropertyInfoForWindow(wxWindow *win);
     // Edit the given window
     void EditWindow(wxWindow *win);
@@ -391,8 +395,9 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#define OBJECT_MENU_EDIT      1
-#define OBJECT_MENU_DELETE    2
+#define OBJECT_MENU_TITLE     1
+#define OBJECT_MENU_EDIT      2
+#define OBJECT_MENU_DELETE    3
 
 /*
 * Main toolbar