SF.net SVN: jazzplusplus: [451] trunk/jazz/src

[<pst...@us...>]

Revision: 451
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=451&view=rev
Author:   pstieber
Date:     2008-04-09 15:10:26 -0700 (Wed, 09 Apr 2008)

Log Message:
-----------
Added a wxWidgets event handler for "File | Close".

Modified Paths:
--------------
    trunk/jazz/src/Harmony.cpp
    trunk/jazz/src/Harmony.h

Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp	2008-04-09 00:25:56 UTC (rev 450)
+++ trunk/jazz/src/Harmony.cpp	2008-04-09 22:10:26 UTC (rev 451)
@@ -1928,7 +1928,10 @@
 //-----------------------------------------------------------------------------
 BEGIN_EVENT_TABLE(HBFrame, wxFrame)
 
+  EVT_CLOSE(HBFrame::OnClose)
 
+  EVT_MENU(wxID_CLOSE, HBFrame::OnCloseWindow)
+
   EVT_UPDATE_UI(MEN_MAJSCALE, HBFrame::OnUpdateMajorScale)
   EVT_MENU(MEN_MAJSCALE, HBFrame::OnToolBarSelect)
 
@@ -2132,13 +2135,6 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-bool HBFrame::OnClose()
-{
-  return true;
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 bool HBFrame::IsSequenceDefined()
 {
   return mpHbWindow->IsSequenceDefined();
@@ -2188,6 +2184,20 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
+void HBFrame::OnClose(wxCloseEvent& Event)
+{
+  Event.Skip();
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void HBFrame::OnCloseWindow(wxCommandEvent& Event)
+{
+  Close();
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 void HBFrame::OnUpdateMajorScale(wxUpdateUIEvent& Event)
 {
   Event.Check(HBCanvas::GetScaleType() == Major);

Modified: trunk/jazz/src/Harmony.h
===================================================================
--- trunk/jazz/src/Harmony.h	2008-04-09 00:25:56 UTC (rev 450)
+++ trunk/jazz/src/Harmony.h	2008-04-09 22:10:26 UTC (rev 451)
@@ -80,12 +80,14 @@
 
     HBAnalyzer* GetAnalyzer();
 
-    virtual bool OnClose();
-
     void TransposeSelection();
 
   protected:
 
+    void OnClose(wxCloseEvent& Event);
+
+    void OnCloseWindow(wxCommandEvent& Event);
+
     void OnUpdateMajorScale(wxUpdateUIEvent& Event);
     void OnUpdateHarmonicMinorScale(wxUpdateUIEvent& Event);
     void OnUpdateMelodicMinorScale(wxUpdateUIEvent& Event);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.