[Audacity-cvs] audacity-src/src/widgets ErrorDialog.cpp, 1.10, 1.11 LinkingHtmlWindow.cpp, 1.12, 1.13 LinkingHtmlWindow.h, 1.4, 1.5

[Vaughan Johnson]

Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7450/widgets

Modified Files:
        ErrorDialog.cpp LinkingHtmlWindow.cpp LinkingHtmlWindow.h 
Log Message:
Fix some problems where ESC didn't work as Cancel.

Index: LinkingHtmlWindow.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/LinkingHtmlWindow.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- LinkingHtmlWindow.h 22 Dec 2007 17:40:18 -0000      1.4
+++ LinkingHtmlWindow.h 6 May 2008 08:03:41 -0000       1.5
@@ -41,6 +41,7 @@
    void OnForward(wxCommandEvent & event);
    void OnBackward(wxCommandEvent & event);
    void OnClose(wxCommandEvent & event);
+   void OnChar(wxKeyEvent & event);
 
    void UpdateButtons();
    //virtual void SetLabel(const wxString& label);

Index: ErrorDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/ErrorDialog.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ErrorDialog.cpp     23 Dec 2007 11:32:02 -0000      1.10
+++ ErrorDialog.cpp     6 May 2008 08:03:40 -0000       1.11
@@ -180,6 +180,7 @@
    pWnd->Fit();
    pWnd->Centre();
    pWnd->Show( true );
+   pWnd->SetFocus();
    //Dlg.Show();
    return;
 }

Index: LinkingHtmlWindow.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/LinkingHtmlWindow.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- LinkingHtmlWindow.cpp       23 Dec 2007 11:32:02 -0000      1.12
+++ LinkingHtmlWindow.cpp       6 May 2008 08:03:41 -0000       1.13
@@ -27,6 +27,7 @@
    EVT_BUTTON( wxID_FORWARD,  BrowserFrame::OnForward)
    EVT_BUTTON( wxID_BACKWARD, BrowserFrame::OnBackward)
    EVT_BUTTON( wxID_CLOSE,    BrowserFrame::OnClose)
+   EVT_CHAR(BrowserFrame::OnChar)
 END_EVENT_TABLE()
 
 
@@ -47,6 +48,18 @@
    Close();
 }
 
+void BrowserFrame::OnChar(wxKeyEvent & event)
+{
+   bool bSkip = true;
+   if (event.GetKeyCode() == WXK_ESCAPE)
+   {
+      bSkip = false; 
+      this->Show(FALSE);
+   }
+   event.Skip(bSkip);
+}
+
+
 void BrowserFrame::UpdateButtons()
 {
    wxWindow * pWnd;


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs