Added code to the RIGHT CLICK popup dialog to show the type:name of the widget/dialog...

Added code to prompt the user for confirmation before deleting an entire DIALOG, to help avoid accidental deletions of the dialog, when the user thought they were deleting a widget.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 4960a602cf33a74c35b886c08cd43ff6a7193437..40f72abe102f730c9f24e71460b80e03523f3cea 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -165,6 +165,8 @@ bool wxResourceManager::Initialize()
 #endif
     
     m_popupMenu = new wxMenu;
 #endif
     
     m_popupMenu = new wxMenu;

+    m_popupMenu->Append(OBJECT_MENU_TITLE, "WIDGET TYPE");
+    m_popupMenu->AppendSeparator();

     m_popupMenu->Append(OBJECT_MENU_EDIT, "Edit properties");
     m_popupMenu->Append(OBJECT_MENU_DELETE, "Delete object");
     
     m_popupMenu->Append(OBJECT_MENU_EDIT, "Edit properties");
     m_popupMenu->Append(OBJECT_MENU_DELETE, "Delete object");
     


@@ -2404,6 +2406,11 @@ void ObjectMenuProc(wxMenu *menu, wxCommandEvent& event)
     
     switch (event.GetId())
     {
     
     switch (event.GetId())
     {

+    case OBJECT_MENU_TITLE:
+        {
+            event.Skip();
+            break;
+        }

     case OBJECT_MENU_EDIT:
         {
             wxResourceManager::GetCurrentResourceManager()->EditWindow(data);
     case OBJECT_MENU_EDIT:
         {
             wxResourceManager::GetCurrentResourceManager()->EditWindow(data);


@@ -2411,9 +2418,15 @@ void ObjectMenuProc(wxMenu *menu, wxCommandEvent& event)
         }
     case OBJECT_MENU_DELETE:
         {
         }
     case OBJECT_MENU_DELETE:
         {

+            // Before deleting a dialog, give the user a last chance
+            // change their mind, in case they accidentally right
+            // clicked the dialog rather than the widget they were
+            // aiming for.

             if (data->IsKindOf(CLASSINFO(wxPanel)))
             {
             if (data->IsKindOf(CLASSINFO(wxPanel)))
             {

-                if (wxMessageBox(wxT("Are you sure?"), wxT("Deleting dialog"), wxYES_NO) == wxNO)
+                wxString str(wxT("Deleting dialog : "));
+                str += data->GetName();
+                if (wxMessageBox(wxT("Are you sure?"), str, wxYES_NO | wxCENTRE) == wxNO)

                     return;
             }
 
                     return;
             }
 

diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h
index 89d108e1e06380f182350c4a9d3ea20039892017..2c92b2acde1e49a107e50ab5b88229aa699ecc3d 100644 (file)
--- a/utils/dialoged/src/reseditr.h
+++ b/utils/dialoged/src/reseditr.h
@@ -182,7 +182,7 @@ public:
     virtual wxResourceEditorScrolledWindow *OnCreateEditorPanel(wxFrame *parent);
     virtual wxToolBar *OnCreateToolBar(wxFrame *parent);
     
     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);
     wxWindowPropertyInfo* CreatePropertyInfoForWindow(wxWindow *win);
     // Edit the given window
     void EditWindow(wxWindow *win);


@@ -391,8 +391,9 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     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
 
 /*
 * Main toolbar