- applied patch that adds more i18n support to XRC handlers

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

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 06ad36600575abefd4aec07faf2dc866e79a82d5..2bf9a8d4873b75e2dd4ec3782d705959c422025d 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -58,7 +58,7 @@
 
 wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
 
 
 wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if !defined(__WXMSW__)

 #include "bitmaps/load.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/new.xpm"
 #include "bitmaps/load.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/new.xpm"


@@ -150,11 +150,9 @@ bool wxResourceManager::Initialize()
     windowsDir += "\\dialoged.ini" ;
     
     m_optionsResourceFilename = windowsDir;
     windowsDir += "\\dialoged.ini" ;
     
     m_optionsResourceFilename = windowsDir;

-#elif defined(__WXGTK__) || defined(__WXMOTIF__) || (defined(__WXMAC__) && defined(__DARWIN__))
+#else

     wxGetHomeDir( &m_optionsResourceFilename );
     m_optionsResourceFilename += "/.dialogedrc";
     wxGetHomeDir( &m_optionsResourceFilename );
     m_optionsResourceFilename += "/.dialogedrc";

-#else
-#error "Unsupported platform."

 #endif
     
     LoadOptions();
 #endif
     
     LoadOptions();


@@ -174,8 +172,7 @@ bool wxResourceManager::Initialize()
     {
 #ifdef __WXMSW__
         m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
     {
 #ifdef __WXMSW__
         m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);

-#endif
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#else

         m_bitmapImage = new wxBitmap( wxwin_xpm );
 #endif
     }
         m_bitmapImage = new wxBitmap( wxwin_xpm );
 #endif
     }


@@ -768,8 +765,7 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
     wxBitmap ToolbarCopyHeightBitmap("COPYHEIGHTTOOL");
     wxBitmap ToolbarDistributeHorizBitmap("DISTHORIZTOOL");
     wxBitmap ToolbarDistributeVertBitmap("DISTVERTTOOL");
     wxBitmap ToolbarCopyHeightBitmap("COPYHEIGHTTOOL");
     wxBitmap ToolbarDistributeHorizBitmap("DISTHORIZTOOL");
     wxBitmap ToolbarDistributeVertBitmap("DISTVERTTOOL");

-#endif
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#else

     wxBitmap ToolbarLoadBitmap( load_xpm );
     wxBitmap ToolbarSaveBitmap( save_xpm);
     wxBitmap ToolbarNewBitmap( new_xpm );
     wxBitmap ToolbarLoadBitmap( load_xpm );
     wxBitmap ToolbarSaveBitmap( save_xpm);
     wxBitmap ToolbarNewBitmap( new_xpm );


@@ -2282,7 +2278,7 @@ void wxResourceEditorFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 void wxResourceEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     char buf[300];
 void wxResourceEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     char buf[300];

-    sprintf(buf, "wxWindows Dialog Editor %.1f\nAuthor: Julian Smart <julian.smart@ukonline.co.uk>\nJulian Smart (c) 1996-1999", wxDIALOG_EDITOR_VERSION);
+    sprintf(buf, "wxWindows Dialog Editor %.1f\n(c) Julian Smart 1996-1999", wxDIALOG_EDITOR_VERSION);

     wxMessageBox(buf, "About Dialog Editor", wxOK|wxCENTRE);
 }
 
     wxMessageBox(buf, "About Dialog Editor", wxOK|wxCENTRE);
 }
 


@@ -2397,51 +2393,6 @@ void wxResourceEditorScrolledWindow::DrawTitle(wxDC& dc)
     }
 }
 
     }
 }
 

-// Popup menu callback
-void ObjectMenuProc(wxMenu *menu, wxCommandEvent& event)
-{
-    wxWindow *data = (wxWindow *)menu->GetClientData();
-    if (!data)
-        return;
-    
-    switch (event.GetId())
-    {
-    case OBJECT_MENU_TITLE:
-        {
-            event.Skip();
-            break;
-        }
-    case OBJECT_MENU_EDIT:
-        {
-            wxResourceManager::GetCurrentResourceManager()->EditWindow(data);
-            break;
-        }
-    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);
-            break;
-        }
-    default:
-        break;
-    }
-}
-

 /*
 * Main toolbar
 *
 /*
 * Main toolbar
 *


@@ -2904,7 +2855,7 @@ bool wxResourceManager::InsertLabelResource(wxItemResource* parent, wxItemResour
         font = parent->GetFont();
 
     if (!font.Ok() || (parent->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS))
         font = parent->GetFont();
 
     if (!font.Ok() || (parent->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS))

-        font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+        font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

 
     int labelX, labelY;
     wxCoord labelWidth, labelHeight;
 
     int labelX, labelY;
     wxCoord labelWidth, labelHeight;