From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Mon, 10 Sep 2001 08:37:25 +0000 (+0000)
Subject: fix linking issues
X-Git-Tag: 1.6.10~20637
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=26063b2ef4b9818b52547e992c511d7c4efe0c0f;p=features.git

fix linking issues


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2715 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 764f3bcf65..603127aff0 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,12 @@
+2001-09-10  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* Toolbar_pimpl.C (C_Toolbar_BubblePost): fix linking
+	(C_Toolbar_BubbleTimerCB): fix linking
+
+	* FormMathsBitmap.C (form): use get() to get the raw pointer.
+
+	* FormMathsBitmap.h: use shared_c_ptr for form_ as well.
+
 2001-09-09  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
 	* combox.C (C_Combox_input_cb): make it static
diff --git a/src/frontends/xforms/Toolbar_pimpl.C b/src/frontends/xforms/Toolbar_pimpl.C
index 655fa2a98e..1133dcfd03 100644
--- a/src/frontends/xforms/Toolbar_pimpl.C
+++ b/src/frontends/xforms/Toolbar_pimpl.C
@@ -106,13 +106,15 @@ void BubbleTimerCB(FL_OBJECT *, long data)
 }
 
 
-extern "C"
+extern "C" {
+	
 static
 void C_Toolbar_BubbleTimerCB(FL_OBJECT * ob, long data)
 {
 	BubbleTimerCB(ob, data);
 }
 
+}
 
 // post_handler for bubble-help (Matthias)
 int BubblePost(FL_OBJECT *ob, int event,
@@ -136,7 +138,8 @@ int BubblePost(FL_OBJECT *ob, int event,
 }
 
 
-extern "C"
+extern "C" {
+	
 static
 int C_Toolbar_BubblePost(FL_OBJECT * ob, int event,
 			 FL_Coord /*mx*/, FL_Coord /*my*/, 
@@ -144,6 +147,8 @@ int C_Toolbar_BubblePost(FL_OBJECT * ob, int event,
 {
 	return BubblePost(ob, event, 0, 0, key, xev);
 }
+
+}
 #endif
 
 } // namespace anon