Helps Borland compile further in Unicode mode.

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

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 61dbed5776c3f85eba07fd920c45027e9fa67d69..34a5dd365c693f0b723df98322cbc073fd6f420f 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -54,10 +54,6 @@
 #include <strstream>
 #endif
 
 #include <strstream>
 #endif
 

-#ifdef __WXMSW__
-#include <windows.h>
-#endif
-

 #ifdef __WXMSW__
 #include "wx/help.h"
 #endif
 #ifdef __WXMSW__
 #include "wx/help.h"
 #endif


@@ -152,12 +148,13 @@ wxResourceManager::~wxResourceManager()
 bool wxResourceManager::Initialize()
 {
   // Set up the resource filename for each platform.
 bool wxResourceManager::Initialize()
 {
   // Set up the resource filename for each platform.

+  // TODO: This shold be replaced by wxConfig usage.

 #ifdef __WXMSW__
   // dialoged.ini in the Windows directory
 #ifdef __WXMSW__
   // dialoged.ini in the Windows directory

-  char buf[256];
-  GetWindowsDirectory(buf, 256);
-  strcat(buf, "\\dialoged.ini");
-  m_optionsResourceFilename = buf;
+  wxString windowsDir = wxGetOSDirectory();
+  windowsDir += "\\dialoged.ini" ;
+
+  m_optionsResourceFilename = windowsDir;

 #elif defined(__WXGTK__) || defined(__WXMOTIF__)
   wxGetHomeDir( &m_optionsResourceFilename );
   m_optionsResourceFilename += "/.dialogedrc";
 #elif defined(__WXGTK__) || defined(__WXMOTIF__)
   wxGetHomeDir( &m_optionsResourceFilename );
   m_optionsResourceFilename += "/.dialogedrc";


@@ -340,10 +337,8 @@ bool wxResourceManager::ShowResourceEditor(bool show, wxWindow *WXUNUSED(parent)
   else
   {
     wxFrame *fr = m_editorFrame;
   else
   {
     wxFrame *fr = m_editorFrame;

-    if (m_editorFrame->OnClose())
+    if (m_editorFrame->Close())

     {
     {

-      fr->Show(FALSE);
-      delete fr;

       m_editorFrame = NULL;
       m_editorPanel = NULL;
     }
       m_editorFrame = NULL;
       m_editorPanel = NULL;
     }


@@ -2076,6 +2071,7 @@ BEGIN_EVENT_TABLE(wxResourceEditorFrame, wxFrame)
     EVT_MENU(RESED_DELETE, wxResourceEditorFrame::OnDeleteSelection)
     EVT_MENU(RESED_RECREATE, wxResourceEditorFrame::OnRecreateSelection)
     EVT_MENU(RESED_TEST, wxResourceEditorFrame::OnTest)
     EVT_MENU(RESED_DELETE, wxResourceEditorFrame::OnDeleteSelection)
     EVT_MENU(RESED_RECREATE, wxResourceEditorFrame::OnRecreateSelection)
     EVT_MENU(RESED_TEST, wxResourceEditorFrame::OnTest)

+    EVT_CLOSE(wxResourceEditorFrame::OnCloseWindow)

 END_EVENT_TABLE()
 
 wxResourceEditorFrame::wxResourceEditorFrame(wxResourceManager *resMan, wxFrame *parent, const wxString& title,
 END_EVENT_TABLE()
 
 wxResourceEditorFrame::wxResourceEditorFrame(wxResourceManager *resMan, wxFrame *parent, const wxString& title,


@@ -2157,12 +2153,15 @@ void wxResourceEditorFrame::OnRecreateSelection(wxCommandEvent& WXUNUSED(event))
       manager->RecreateSelection();
 }
 
       manager->RecreateSelection();
 }
 

-bool wxResourceEditorFrame::OnClose()
+void wxResourceEditorFrame::OnCloseWindow(wxCloseEvent& event)

 {
   if (manager->Modified())
   {
 {
   if (manager->Modified())
   {

-  if (!manager->Clear(TRUE, FALSE))
-     return FALSE;
+     if (!manager->Clear(TRUE, FALSE))
+     {
+       event.Veto();
+       return;
+    }

   }
     
   if (!Iconized())
   }
     
   if (!Iconized())


@@ -2181,7 +2180,7 @@ bool wxResourceEditorFrame::OnClose()
   manager->SetEditorFrame(NULL);
   manager->SetEditorToolBar(NULL);
 
   manager->SetEditorFrame(NULL);
   manager->SetEditorToolBar(NULL);
 

-  return TRUE;
+  this->Destroy();

 }
 
 /*
 }
 
 /*