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

try out anonnamespace, detfault to expanded minipage

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1789 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-03-17 02:06:21 +00:00
parent 3fa594b2f9
commit 5115349d11
8 changed files with 59 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
po/POTFILES.in
View File

@ -64,6 +64,7 @@ src/frontends/kde/tocdlg.C
src/frontends/kde/urldlg.C
src/frontends/qt2/FileDialog.C
src/frontends/qt2/FormCharacter.C
src/frontends/qt2/FormCitation.C
src/frontends/qt2/FormCopyright.C
src/frontends/qt2/FormParagraph.C
src/frontends/qt2/FormPrint.C
@ -73,59 +74,58 @@ src/frontends/qt2/paragraphdlgimpl.C
src/frontends/qt2/tabularcreatedlgimpl.C
src/frontends/xforms/combox.C
src/frontends/xforms/FileDialog.C
src/frontends/xforms/FormBibitem.C
src/frontends/xforms/form_bibitem.C
src/frontends/xforms/FormBibtex.C
src/frontends/xforms/FormBibitem.C
src/frontends/xforms/form_bibtex.C
src/frontends/xforms/FormBibtex.C
src/frontends/xforms/form_browser.C
src/frontends/xforms/FormCharacter.C
src/frontends/xforms/form_character.C
src/frontends/xforms/FormCitation.C
src/frontends/xforms/FormCharacter.C
src/frontends/xforms/form_citation.C
src/frontends/xforms/FormCopyright.C
src/frontends/xforms/FormCitation.C
src/frontends/xforms/form_copyright.C
src/frontends/xforms/FormCredits.C
src/frontends/xforms/FormCopyright.C
src/frontends/xforms/form_credits.C
src/frontends/xforms/FormDocument.C
src/frontends/xforms/FormCredits.C
src/frontends/xforms/form_document.C
src/frontends/xforms/FormError.C
src/frontends/xforms/FormDocument.C
src/frontends/xforms/form_error.C
src/frontends/xforms/FormExternal.C
src/frontends/xforms/FormError.C
src/frontends/xforms/form_external.C
src/frontends/xforms/FormFiledialog.C
src/frontends/xforms/FormExternal.C
src/frontends/xforms/form_filedialog.C
src/frontends/xforms/FormGraphics.C
src/frontends/xforms/FormFiledialog.C
src/frontends/xforms/form_graphics.C
src/frontends/xforms/FormInclude.C
src/frontends/xforms/FormGraphics.C
src/frontends/xforms/form_include.C
src/frontends/xforms/FormIndex.C
src/frontends/xforms/FormInclude.C
src/frontends/xforms/form_index.C
src/frontends/xforms/FormIndex.C
src/frontends/xforms/FormLog.C
src/frontends/xforms/form_maths.C
src/frontends/xforms/FormMaths.C
src/frontends/xforms/form_minipage.C
src/frontends/xforms/FormMinipage.C
src/frontends/xforms/form_paragraph.C
src/frontends/xforms/FormMaths.C
src/frontends/xforms/form_maths.C
src/frontends/xforms/FormParagraph.C
src/frontends/xforms/form_paragraph.C
src/frontends/xforms/FormPreamble.C
src/frontends/xforms/form_preamble.C
src/frontends/xforms/FormPreferences.C
src/frontends/xforms/FormPreamble.C
src/frontends/xforms/form_preferences.C
src/frontends/xforms/FormPrint.C
src/frontends/xforms/FormPreferences.C
src/frontends/xforms/form_print.C
src/frontends/xforms/FormRef.C
src/frontends/xforms/FormPrint.C
src/frontends/xforms/form_ref.C
src/frontends/xforms/FormSearch.C
src/frontends/xforms/FormRef.C
src/frontends/xforms/form_search.C
src/frontends/xforms/FormTabular.C
src/frontends/xforms/FormSearch.C
src/frontends/xforms/form_tabular.C
src/frontends/xforms/FormTabularCreate.C
src/frontends/xforms/FormTabular.C
src/frontends/xforms/form_tabular_create.C
src/frontends/xforms/FormToc.C
src/frontends/xforms/FormTabularCreate.C
src/frontends/xforms/form_toc.C
src/frontends/xforms/FormUrl.C
src/frontends/xforms/FormToc.C
src/frontends/xforms/form_url.C
src/frontends/xforms/FormUrl.C
src/frontends/xforms/FormVCLog.C
src/frontends/xforms/input_validators.C
src/frontends/xforms/Menubar_pimpl.C

9
src/BufferView_pimpl.C
View File

@ -80,14 +80,17 @@ extern int bibitemMaxWidth(BufferView *, LyXFont const &);
const unsigned int saved_positions_num = 20;
static inline
namespace {
//static
inline
void waitForX()
{
XSync(fl_get_display(), 0);
}
static
//static
void SetXtermCursor(Window win)
{
static Cursor cursor;
@ -101,6 +104,8 @@ void SetXtermCursor(Window win)
XFlush(fl_get_display());
}
} // anon namespace
BufferView::Pimpl::Pimpl(BufferView * b, LyXView * o,
int xpos, int ypos, int width, int height)

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2001-03-17 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com>
* tabular.C (l_getline): use string::erase, small whitespace change.
* BufferView_pimpl.C: try the anon namespace.
* WorkArea.C: ditto
2001-03-16 Juergen Vigna <jug@sad.it>
* BufferView_pimpl.C (workAreaButtonRelease): return only on button==2

8
src/WorkArea.C
View File

@ -33,12 +33,17 @@ FL_OBJECT * figinset_canvas;
// This is at least true for g++.
//using std::abs;
static inline
namespace {
//static
inline
void waitForX()
{
XSync(fl_get_display(), 0);
}
} // anon namespace
extern "C" {
// Just a bunch of C wrappers around static members of WorkArea
@ -57,7 +62,6 @@ extern "C" {
}
WorkArea::WorkArea(int xpos, int ypos, int width, int height)
: workareapixmap(0), painter_(*this)
{

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2001-03-17 Lars Gullik Bjønnes <larsbj@trylle.birdstep.com>
* insetminipage.C (InsetMinipage): default to not collapsed
2001-03-16 Juergen Vigna <jug@sad.it>
* insetminipage.C (width): modified with to be a string

7
src/insets/insetcollapsable.h
View File

@ -156,8 +156,11 @@ public:
// protected method "clickInButton" (Lgb)
protected:
///
mutable int
button_length, button_top_y, button_bottom_y;
mutable int button_length;
///
mutable int button_top_y;
///
mutable int button_bottom_y;
private:
///

1
src/insets/insetminipage.C
View File

@ -69,6 +69,7 @@ InsetMinipage::InsetMinipage()
setLabelFont(font);
setAutoCollapse(false);
setInsetName("Minipage");
collapsed = false;
}

8
src/tabular.C
View File

@ -1225,11 +1225,11 @@ bool getTokenValue(string const & str, const char * token, bool & flag)
static inline
void l_getline(istream & is, string & str)
{
str = string();
while(str.empty()) {
str.erase();
while (str.empty()) {
getline(is, str);
if (!str.empty() && str[str.length()-1] == '\r')
str.erase(str.length()-1);
if (!str.empty() && str[str.length() - 1] == '\r')
str.erase(str.length() - 1);
}
}