Mercurial > flash_v2

changeset 560:4fbd36edba7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* standalone/wxwin/filename.cpp: Eliminate (const WCHAR*) cast in call to PathRelativePathTo() which is related to an error in w32api/shlwapi.h. * standalone/mainwin.cpp: Implement simplified 'About' dialog box to eliminate configtool.bin resource file dependency. * standalone/wxwin/configtool.cpp: Supress obsolete splash screen and associated resources for now.
author jld
date Mon, 03 Feb 2003 15:42:55 +0000
parents 153384f24406
children f30f2d57da64
files host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/configtool.cpp host/tools/configtool/standalone/wxwin/filename.cpp host/tools/configtool/standalone/wxwin/mainwin.cpp
diffstat 4 files changed, 31 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -1,3 +1,15 @@
+2003-02-03  John Dallaway  <jld@ecoscentric.com>
+
+	* standalone/wxwin/filename.cpp: Eliminate (const WCHAR*) cast
+	in call to PathRelativePathTo() which is related to an error
+	in w32api/shlwapi.h.
+
+	* standalone/configtool.cpp: Suppress obsolete splash screen and
+	associated resources for now.
+
+	* standalone/mainwin.cpp: Implement simplified 'About' dialog box
+	to eliminate configtool.bin resource file dependency.
+
 2003-01-25  John Dallaway  <jld@ecoscentric.com>
 
 	* standalone/wxwin/configtool.cpp: Use correct data type in call
--- a/host/tools/configtool/standalone/wxwin/configtool.cpp
+++ b/host/tools/configtool/standalone/wxwin/configtool.cpp
@@ -2,6 +2,7 @@
 //
 // ----------------------------------------------------------------------------
 // Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
+// Copyright (C) 2003 John Dallaway
 //
 // This program is part of the eCos host tools.
 //
@@ -27,8 +28,8 @@
 //===========================================================================
 //#####DESCRIPTIONBEGIN####
 //
-// Author(s):   julians
-// Contact(s):  julians
+// Author(s):   julians, jld
+// Contact(s):  julians, jld
 // Date:        2000/08/24
 // Version:     $Id: configtool.cpp,v 1.51 2001/12/11 15:59:51 julians Exp $
 // Purpose:
@@ -512,17 +513,17 @@ bool ecApp::LoadResources()
 {
     wxFileSystem::AddHandler(new wxMemoryFSHandler);
 
-    LoadBitmapResource(m_splashScreenBitmap, wxT("splash16.png"), wxBITMAP_TYPE_PNG, FALSE);
+//    LoadBitmapResource(m_splashScreenBitmap, wxT("splash16.png"), wxBITMAP_TYPE_PNG, FALSE);
 
-    wxBitmap bitmap1, bitmap2, bitmap3;
-    LoadBitmapResource(bitmap1, wxT("ecoslogo.png"), wxBITMAP_TYPE_PNG, TRUE);
-    LoadBitmapResource(bitmap2, wxT("ecoslogosmall.png"), wxBITMAP_TYPE_PNG, TRUE);
-    LoadBitmapResource(bitmap3, wxT("rhlogo.png"), wxBITMAP_TYPE_PNG, TRUE);
+//    wxBitmap bitmap1, bitmap2, bitmap3;
+//    LoadBitmapResource(bitmap1, wxT("ecoslogo.png"), wxBITMAP_TYPE_PNG, TRUE);
+//    LoadBitmapResource(bitmap2, wxT("ecoslogosmall.png"), wxBITMAP_TYPE_PNG, TRUE);
+//    LoadBitmapResource(bitmap3, wxT("rhlogo.png"), wxBITMAP_TYPE_PNG, TRUE);
 
-    wxString aboutText;
-    LoadTextResource(aboutText, wxT("about.htm"), TRUE);
+//    wxString aboutText;
+//    LoadTextResource(aboutText, wxT("about.htm"), TRUE);
 
-    VersionStampSplashScreen();
+//    VersionStampSplashScreen();
 
     return TRUE;
 }
--- a/host/tools/configtool/standalone/wxwin/filename.cpp
+++ b/host/tools/configtool/standalone/wxwin/filename.cpp
@@ -2,6 +2,7 @@
 //                                                                          
 // ----------------------------------------------------------------------------
 // Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
+// Copyright (C) 2003 John Dallaway
 //
 // This program is part of the eCos host tools.
 //
@@ -448,7 +449,7 @@ ecFileName ecFileName::Relative(const wx
 {
 #ifdef __WXMSW__
     wxString rc;
-    bool b=(TRUE==PathRelativePathTo(rc.GetWriteBuf(1+MAX_PATH),current,FILE_ATTRIBUTE_DIRECTORY,(const WCHAR*)compare,0));
+    bool b=(TRUE==PathRelativePathTo(rc.GetWriteBuf(1+MAX_PATH),current,FILE_ATTRIBUTE_DIRECTORY,compare,0));
     rc.UngetWriteBuf();
     return b?(ecFileName)rc:(ecFileName)compare;
 #else
--- a/host/tools/configtool/standalone/wxwin/mainwin.cpp
+++ b/host/tools/configtool/standalone/wxwin/mainwin.cpp
@@ -2,6 +2,7 @@
 //
 // ----------------------------------------------------------------------------
 // Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
+// Copyright (C) 2003 John Dallaway
 //
 // This program is part of the eCos host tools.
 //
@@ -27,8 +28,8 @@
 //===========================================================================
 //#####DESCRIPTIONBEGIN####
 //
-// Author(s):   julians
-// Contact(s):  julians
+// Author(s):   julians, jld
+// Contact(s):  julians, jld
 // Date:        2000/08/24
 // Version:     $Id: mainwin.cpp,v 1.57 2002/02/28 18:30:35 julians Exp $
 // Purpose:
@@ -546,8 +547,9 @@ void ecMainFrame::OnUpdateFindNext(wxUpd
 
 void ecMainFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    ecAboutDialog dialog(this, ecID_ABOUT_DIALOG, _("About eCos Configuration Tool"));
-    dialog.ShowModal();
+//    ecAboutDialog dialog(this, ecID_ABOUT_DIALOG, _("About eCos Configuration Tool"));
+//    dialog.ShowModal();
+    wxMessageBox(_("eCos Configuration Tool 2.12.net\n\nCopyright (c) Red Hat, Inc. 1998-2002\nCopyright (c) John Dallaway 2003"), _("About eCos Configuration Tool"), wxICON_INFORMATION | wxOK);
 }
 
 void ecMainFrame::OnSize(wxSizeEvent& WXUNUSED(event))