Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12661
Modified Files:
Tag: Audacity_UmixIt
Lyrics.cpp Lyrics.h
Log Message:
revised LinkingHtmlWindow
Index: Lyrics.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/Lyrics.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- Lyrics.h 30 Nov 2006 23:34:20 -0000 1.1.2.3
+++ Lyrics.h 22 Mar 2007 02:13:57 -0000 1.1.2.4
@@ -16,7 +16,8 @@
#include <wx/dynarray.h>
#include <wx/panel.h>
-#include <wx/html/htmlwin.h>
+
+#include "widgets/LinkingHtmlWindow.h"
#define LYRICS_DEFAULT_WIDTH 440
#define LYRICS_DEFAULT_HEIGHT 280
@@ -34,13 +35,6 @@
WX_DECLARE_OBJARRAY(Syllable, SyllableArray);
-class LinkingHtmlWindow : public wxHtmlWindow
-{
- public:
- LinkingHtmlWindow(wxWindow *parent) : wxHtmlWindow(parent) {};
- virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
-};
-
class Lyrics : public wxPanel
{
DECLARE_DYNAMIC_CLASS(Lyrics)
Index: Lyrics.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Attic/Lyrics.cpp,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- Lyrics.cpp 12 Dec 2006 03:17:23 -0000 1.1.2.7
+++ Lyrics.cpp 22 Mar 2007 02:13:57 -0000 1.1.2.8
@@ -23,19 +23,6 @@
#include <wx/arrimpl.cpp>
WX_DEFINE_OBJARRAY(SyllableArray);
-void LinkingHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
-{
-#ifdef __WXMAC__
- wxString openCmd = "open " + link.GetHref();
- ::wxExecute(openCmd);
-#else
- wxFileType* pFileType =
wxTheMimeTypesManager->GetFileTypeFromExtension(wxT(".htm"));
- if (pFileType == NULL) return;
- wxString openCmd = pFileType->GetOpenCommand(link.GetHref());
- ::wxExecute(openCmd);
-#endif
-}
-
BEGIN_EVENT_TABLE(Lyrics, wxPanel)
EVT_CHAR(Lyrics::OnKeyEvent)
EVT_PAINT(Lyrics::OnPaint)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
