From 3dd3381b2d679b2422b45dc60d9f531bb0b391b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= <larsbj@gullik.org>
Date: Tue, 17 Apr 2001 14:06:11 +0000
Subject: [PATCH] inherit privately from noncopyable, set c++ mode, swap init
 order

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1928 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/controllers/ButtonController.h     | 5 +++--
 src/frontends/controllers/ButtonControllerBase.h | 3 ++-
 src/frontends/controllers/ButtonPolicies.h       | 3 ++-
 src/frontends/controllers/ChangeLog              | 9 +++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/frontends/controllers/ButtonController.h b/src/frontends/controllers/ButtonController.h
index d79733183c..b0337d3fd8 100644
--- a/src/frontends/controllers/ButtonController.h
+++ b/src/frontends/controllers/ButtonController.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
@@ -61,8 +62,8 @@ private:
 
 template <class Button, class Widget>
 GuiBC<Button, Widget>::GuiBC(string const & cancel, string const & close)
-	: ButtonControllerBase(cancel, close)
-	, okay_(0), apply_(0), restore_(0), cancel_(0)
+	: ButtonControllerBase(cancel, close),
+	  okay_(0), apply_(0), cancel_(0), restore_(0)
 {}
 
 
diff --git a/src/frontends/controllers/ButtonControllerBase.h b/src/frontends/controllers/ButtonControllerBase.h
index d82098ab2d..5114fb483b 100644
--- a/src/frontends/controllers/ButtonControllerBase.h
+++ b/src/frontends/controllers/ButtonControllerBase.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /* This file is part of
  * ====================================================== 
  *
@@ -31,7 +32,7 @@
  * This abstract base class stripped of xforms-specific code by
  * Angus Leeming <a.leeming@ic.ac.uk>
  */
-class ButtonControllerBase : public boost::noncopyable
+class ButtonControllerBase : boost::noncopyable
 {
 public:
 	/** Constructor.
diff --git a/src/frontends/controllers/ButtonPolicies.h b/src/frontends/controllers/ButtonPolicies.h
index 09c739640d..654f78049f 100644
--- a/src/frontends/controllers/ButtonPolicies.h
+++ b/src/frontends/controllers/ButtonPolicies.h
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /*
  * \file ButtonPolicies.h
  * \author Allan Rae, rae@lyx.org
@@ -68,7 +69,7 @@
 
     The IgnorantPolicy is a special case that allows anything.
  */
-class ButtonPolicy : public boost::noncopyable {
+class ButtonPolicy : boost::noncopyable {
 public:
 	///
 	virtual ~ButtonPolicy() {}
diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index bde59e42e2..03b8fce3b7 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-17  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* ButtonControllerBase.h: C++ mode, inherit privately from
+	noncopyable 
+	* ButtonPolicies.h: ditto
+
+	* ButtonController.h: C++ mode, swap init order of restore_ and
+	cancel_ 
+
 2001-04-06  John Levon  <moz@compsoc.man.ac.uk>
 
 	* ControlTabularCreate.h: