X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1378f2602776dc7a094a4d9b02ff11f4cbbd550d..c48792de4abe190910c0cb212c5df44d2ef87a7e:/utils/dialoged/src/reseditr.cpp?ds=sidebyside

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 354ba14410..f4d2e4d600 100644
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -58,7 +58,7 @@
 
 wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "bitmaps/load.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/new.xpm"
@@ -150,7 +150,7 @@ bool wxResourceManager::Initialize()
     windowsDir += "\\dialoged.ini" ;
     
     m_optionsResourceFilename = windowsDir;
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+#elif defined(__WXGTK__) || defined(__WXMOTIF__) || (defined(__WXMAC__) && defined(__DARWIN__))
     wxGetHomeDir( &m_optionsResourceFilename );
     m_optionsResourceFilename += "/.dialogedrc";
 #else
@@ -165,6 +165,8 @@ bool wxResourceManager::Initialize()
 #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");
     
@@ -767,7 +769,7 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
     wxBitmap ToolbarDistributeHorizBitmap("DISTHORIZTOOL");
     wxBitmap ToolbarDistributeVertBitmap("DISTVERTTOOL");
 #endif
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     wxBitmap ToolbarLoadBitmap( load_xpm );
     wxBitmap ToolbarSaveBitmap( save_xpm);
     wxBitmap ToolbarNewBitmap( new_xpm );
@@ -2380,7 +2382,7 @@ void wxResourceEditorScrolledWindow::DrawTitle(wxDC& dc)
         {
             wxString str(res->GetTitle());
             int x, y;
-            ViewStart(& x, & y);
+            GetViewStart(& x, & y);
             
             wxFont font(10, wxSWISS, wxNORMAL, wxBOLD);
             dc.SetFont(font);
@@ -2404,6 +2406,11 @@ void ObjectMenuProc(wxMenu *menu, wxCommandEvent& event)
     
     switch (event.GetId())
     {
+    case OBJECT_MENU_TITLE:
+        {
+            event.Skip();
+            break;
+        }
     case OBJECT_MENU_EDIT:
         {
             wxResourceManager::GetCurrentResourceManager()->EditWindow(data);
@@ -2411,8 +2418,20 @@ void ObjectMenuProc(wxMenu *menu, wxCommandEvent& event)
         }
     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)))
+            {
+                wxString str(wxT("Deleting dialog : "));
+                str += data->GetName();
+                if (wxMessageBox(wxT("Are you sure?"), str, wxYES_NO | wxCENTRE) == wxNO)
+                    return;
+            }
+
             wxResourceManager::GetCurrentResourceManager()->DeselectItemIfNecessary(data);
-            
+
             wxResourceManager::GetCurrentResourceManager()->SaveInfoAndDeleteHandler(data);
             wxResourceManager::GetCurrentResourceManager()->DeleteResource(data);
             wxResourceManager::GetCurrentResourceManager()->DeleteWindow(data);