[lmi-commits] [6541] Expunge a module that no longer does anything

[Greg Chicares]

Revision: 6541
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6541
Author:   chicares
Date:     2016-03-30 21:41:10 +0000 (Wed, 30 Mar 2016)
Log Message:
-----------
Expunge a module that no longer does anything

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/Makefile.am
    lmi/trunk/objects.make
    lmi/trunk/skeleton.cpp

Removed Paths:
-------------
    lmi/trunk/docmdichildframe_ex.cpp
    lmi/trunk/docmdichildframe_ex.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2016-03-30 21:35:23 UTC (rev 6540)
+++ lmi/trunk/ChangeLog 2016-03-30 21:41:10 UTC (rev 6541)
@@ -38813,9 +38813,37 @@
 Avoid shadowing variable names (VZ). See:
   http://lists.nongnu.org/archive/html/lmi/2016-02/msg00017.html
 
+20160327T2223Z <zeitlin> [454]
+
+  configure.ac
+Recognize gcc cross-compilers.
+
 20160330T1945Z <address@hidden> [454]
 
   multidimgrid_any.cpp
 Further improve the 20160327T1021Z improvement (VZ). See:
   http://lists.nongnu.org/archive/html/lmi/2016-03/msg00042.html
 
+20160330T2132Z <address@hidden> [454]
+
+  docmdichildframe_ex.cpp
+  docmdichildframe_ex.hpp
+Remove unneeded dtor (VZ).
+
+20160330T2135Z <address@hidden> [454]
+
+  docmdichildframe_ex.cpp
+  docmdichildframe_ex.hpp
+Remove unneeded statusbar workarounds (VZ).
+
+20160330T2141Z <address@hidden> [454]
+
+  Makefile.am
+  docmdichildframe_ex.cpp [expunged]
+  docmdichildframe_ex.hpp [expunged]
+  objects.make
+  skeleton.cpp
+Expunge a module that no longer does anything. See:
+  http://lists.nongnu.org/archive/html/lmi/2016-03/msg00054.html
+  http://lists.nongnu.org/archive/html/lmi/2014-11/msg00062.html
+

Modified: lmi/trunk/Makefile.am
===================================================================
--- lmi/trunk/Makefile.am       2016-03-30 21:35:23 UTC (rev 6540)
+++ lmi/trunk/Makefile.am       2016-03-30 21:41:10 UTC (rev 6541)
@@ -162,7 +162,6 @@
     database_view_editor.cpp \
     default_view.cpp \
     docmanager_ex.cpp \
-    docmdichildframe_ex.cpp \
     file_command_wx.cpp \
     gpt_document.cpp \
     gpt_view.cpp \
@@ -1078,7 +1077,6 @@
     default_view.hpp \
     deserialize_cast.hpp \
     docmanager_ex.hpp \
-    docmdichildframe_ex.hpp \
     edit_mvc_docview_parameters.hpp \
     emit_ledger.hpp \
     exit_codes.hpp \

Deleted: lmi/trunk/docmdichildframe_ex.cpp
===================================================================
--- lmi/trunk/docmdichildframe_ex.cpp   2016-03-30 21:35:23 UTC (rev 6540)
+++ lmi/trunk/docmdichildframe_ex.cpp   2016-03-30 21:41:10 UTC (rev 6541)
@@ -1,56 +0,0 @@
-// Customize implementation details of library class wxDocMDIChildFrame.
-//
-// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 
2014, 2015, 2016 Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-// $Id$
-
-#include "docmdichildframe_ex.hpp"
-
-#include <wx/menu.h>
-
-#include <stdexcept>
-
-IMPLEMENT_CLASS(DocMDIChildFrameEx, wxDocMDIChildFrame)
-
-BEGIN_EVENT_TABLE(DocMDIChildFrameEx, wxDocMDIChildFrame)
-END_EVENT_TABLE()
-
-DocMDIChildFrameEx::DocMDIChildFrameEx
-    (wxDocument*       doc
-    ,wxView*           view
-    ,wxMDIParentFrame* parent
-    ,wxWindowID        id
-    ,wxString   const& title
-    ,wxPoint    const& pos
-    ,wxSize     const& size
-    ,long int          style
-    ,wxString   const& name
-    )
-    :wxDocMDIChildFrame(doc, view, parent, id, title, pos, size, style, name)
-{
-}
-
-#if !wxCHECK_VERSION(2,5,4)
-    // The MDI "Window" menu did not display correctly for wx
-    // versions prior to 2.5.4 . This error directive may be
-    // suppressed if living with that problem is acceptable.
-#   error Outdated library: wx-2.5.4 or greater is required.
-#endif // !wxCHECK_VERSION(2,5,4)
-

Deleted: lmi/trunk/docmdichildframe_ex.hpp
===================================================================
--- lmi/trunk/docmdichildframe_ex.hpp   2016-03-30 21:35:23 UTC (rev 6540)
+++ lmi/trunk/docmdichildframe_ex.hpp   2016-03-30 21:41:10 UTC (rev 6541)
@@ -1,58 +0,0 @@
-// Customize implementation details of library class wxDocMDIChildFrame.
-//
-// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 
2014, 2015, 2016 Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-// $Id$
-
-// This will soon be removed because it no longer serves any purpose.
-
-#ifndef docmdichildframe_ex_hpp
-#define docmdichildframe_ex_hpp
-
-#include "config.hpp"
-
-#include "uncopyable_lmi.hpp"
-
-#include <wx/docmdi.h>
-
-class DocMDIChildFrameEx
-    :public  wxDocMDIChildFrame
-    ,private lmi::uncopyable<DocMDIChildFrameEx>
-{
-  public:
-    DocMDIChildFrameEx
-        (wxDocument*       doc
-        ,wxView*           view
-        ,wxMDIParentFrame* parent
-        ,wxWindowID        id     = wxID_ANY
-        ,wxString   const& title  = "Loading..."
-        ,wxPoint    const& pos    = wxDefaultPosition
-        ,wxSize     const& size   = wxDefaultSize
-        ,long int          style  = wxDEFAULT_FRAME_STYLE
-        ,wxString   const& name   = "child frame"
-        );
-
-  private:
-    DECLARE_CLASS(DocMDIChildFrameEx)
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // docmdichildframe_ex_hpp
-

Modified: lmi/trunk/objects.make
===================================================================
--- lmi/trunk/objects.make      2016-03-30 21:35:23 UTC (rev 6540)
+++ lmi/trunk/objects.make      2016-03-30 21:41:10 UTC (rev 6541)
@@ -314,7 +314,6 @@
   database_view_editor.o \
   default_view.o \
   docmanager_ex.o \
-  docmdichildframe_ex.o \
   file_command_wx.o \
   gpt_document.o \
   gpt_view.o \

Modified: lmi/trunk/skeleton.cpp
===================================================================
--- lmi/trunk/skeleton.cpp      2016-03-30 21:35:23 UTC (rev 6540)
+++ lmi/trunk/skeleton.cpp      2016-03-30 21:41:10 UTC (rev 6541)
@@ -53,7 +53,6 @@
 #include "dbdict.hpp"                   // print_databases()
 #include "default_view.hpp"
 #include "docmanager_ex.hpp"
-#include "docmdichildframe_ex.hpp"
 #include "fenv_guard.hpp"
 #include "fenv_lmi.hpp"
 #include "getopt.hpp"
@@ -91,7 +90,7 @@
 #include <wx/artprov.h>
 #include <wx/config.h>
 #include <wx/cshelp.h>
-#include <wx/docmdi.h>
+#include <wx/docmdi.h>                  // class wxDocMDIChildFrame
 #include <wx/image.h>
 #include <wx/log.h>                     // wxSafeShowMessage()
 #include <wx/math.h>                    // wxRound()
@@ -214,10 +213,12 @@
             frame_->GetActiveChild()
         &&  frame_->GetActiveChild()->IsMaximized()
         ;
-    DocMDIChildFrameEx* child_frame = new DocMDIChildFrameEx
+    wxDocMDIChildFrame* child_frame = new wxDocMDIChildFrame
         (doc
         ,view
         ,frame_
+        ,wxID_ANY
+        ,"Loading..."
         );
     child_frame->SetIcon(view->Icon());
     child_frame->SetMenuBar(AdjustMenus(view->MenuBar()));