anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add some ifdef guards around the code that jug commented out. still commented out if FL_REVISION == 89

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@225 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 1999-10-22 02:37:56 +00:00
parent 5117a9df99
commit 39e945a785
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
1999-10-22 Lars Gullik Bjønnes <larsbj@lyx.org> 1999-10-22 Lars Gullik Bjønnes <larsbj@lyx.org>
* src/insets/figinset.C: added ifdef guards around the fl_free
code that asger commented out. Now it is commented out when
compiling with XForms == 0.89.
* src/support/lyxstring.C: moved the definition of lyxstring::Srep * src/support/lyxstring.C: moved the definition of lyxstring::Srep
to lyxstring.C, and only keep a forward declaration in to lyxstring.C, and only keep a forward declaration in
lyxstring.h. Simplifies the header file a bit and should help a lyxstring.h. Simplifies the header file a bit and should help a

30
src/insets/figinset.C
View File

@ -978,10 +978,14 @@ static void UnregisterFigure(InsetFig *fi)
tmpfig->inset->form->OkBtn); tmpfig->inset->form->OkBtn);
fl_hide_form(tmpfig->inset->form->Figure); fl_hide_form(tmpfig->inset->form->Figure);
} }
#if FL_REVISION == 89
#warning Reactivate this free_form calls #warning Reactivate this free_form calls
// fl_free_form(tmpfig->inset->form->Figure); #endif
// free(tmpfig->inset->form); #if FL_REVISION != 89
// tmpfig->inset->form = 0; fl_free_form(tmpfig->inset->form->Figure);
free(tmpfig->inset->form);
tmpfig->inset->form = 0;
#endif
} }
i = FindFigIndex(tmpfig); i = FindFigIndex(tmpfig);
--figinsref; --figinsref;
@ -1925,10 +1929,14 @@ void InsetFig::CallbackFig(long arg)
if (arg == 8) { if (arg == 8) {
fl_set_focus_object(form->Figure, form->OkBtn); fl_set_focus_object(form->Figure, form->OkBtn);
fl_hide_form(form->Figure); fl_hide_form(form->Figure);
#if FL_REVISION == 89
#warning Reactivate this free_form calls #warning Reactivate this free_form calls
// fl_free_form(form->Figure); #endif
// free(form); #if FL_REVISION != 89
// form = 0; fl_free_form(form->Figure);
free(form);
form = 0;
#endif
} }
break; break;
} //if not readonly } //if not readonly
@ -1939,10 +1947,14 @@ void InsetFig::CallbackFig(long arg)
case 9: /* cancel = restore and close */ case 9: /* cancel = restore and close */
fl_set_focus_object(form->Figure, form->OkBtn); fl_set_focus_object(form->Figure, form->OkBtn);
fl_hide_form(form->Figure); fl_hide_form(form->Figure);
#if FL_REVISION == 89
#warning Reactivate this free_form calls #warning Reactivate this free_form calls
// fl_free_form(form->Figure); #endif
// free(form); #if FL_REVISION != 89
// form = 0; fl_free_form(form->Figure);
free(form);
form = 0;
#endif
break; break;
} }