Herbert's patch, part 1

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 8bb730868f2d1a8c47bb67b376c496f414f150f4..1306b2bddf820c18679e0b00ff5d432af49597ff 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -15,23 +15,25 @@
 #include <utility> 
 #include <iostream>
 
 #include <utility> 
 #include <iostream>
 

-#include FORMS_H_LOCATION
-

 #include "lyx_cb.h"
 #include "lyx_gui_misc.h"
 #include "lyx_main.h"
 #include "lyx_cb.h"
 #include "lyx_gui_misc.h"
 #include "lyx_main.h"

+#include "buffer.h"

 #include "bufferlist.h"
 #include "bufferview_funcs.h"
 #include "bufferlist.h"
 #include "bufferview_funcs.h"

+#include "debug.h"

 #include "lastfiles.h"
 #include "LyXView.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
 #include "frontends/FileDialog.h"
 #include "lastfiles.h"
 #include "LyXView.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
 #include "frontends/FileDialog.h"

+#include "frontends/GUIRunTime.h"

 #include "insets/insetlabel.h"
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/syscall.h"
 #include "insets/insetlabel.h"
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/syscall.h"

+#include "support/lstrings.h"

 #include "gettext.h"
 #include "BufferView.h"
 
 #include "gettext.h"
 #include "BufferView.h"
 


@@ -63,15 +65,15 @@ extern bool finished; // all cleanup done just let it run through now.
 
    During the lock, all button and keyboard events will be modified
    and send to the inset through the following inset-features. Note that
 
    During the lock, all button and keyboard events will be modified
    and send to the inset through the following inset-features. Note that

-   Inset::InsetUnlock will be called from inside UnlockInset. It is meant
+   Inset::insetUnlock will be called from inside UnlockInset. It is meant

    to contain the code for restoring the menus and things like this.
 
    
    to contain the code for restoring the menus and things like this.
 
    

-   virtual void InsetButtonPress(int x, int y, int button);
-   virtual void InsetButtonRelease(int x, int y, int button);
-   virtual void InsetKeyPress(XKeyEvent *ev);
-   virtual void InsetMotionNotify(int x, int y, int state);
-   virtual void InsetUnlock();
+   virtual void insetButtonPress(int x, int y, int button);
+   virtual void insetButtonRelease(int x, int y, int button);
+   virtual void insetKeyPress(XKeyEvent *ev);
+   virtual void insetMotionNotify(int x, int y, int state);
+   virtual void insetUnlock();

 
    If a inset wishes any redraw and/or update it just has to call
    UpdateInset(this).
 
    If a inset wishes any redraw and/or update it just has to call
    UpdateInset(this).


@@ -134,7 +136,7 @@ void ShowMessage(Buffer const * buf,
 bool MenuWrite(BufferView * bv, Buffer * buffer)
 {
        // FIXME: needed ?
 bool MenuWrite(BufferView * bv, Buffer * buffer)
 {
        // FIXME: needed ?

-       XFlush(fl_get_display());
+       XFlush(GUIRunTime::x11Display());

  
        if (!buffer->save()) {
                string const fname = buffer->fileName();
  
        if (!buffer->save()) {
                string const fname = buffer->fileName();


@@ -277,10 +279,10 @@ int MenuRunChktex(Buffer * buffer)
 
 void QuitLyX()
 {
 
 void QuitLyX()
 {

-       lyxerr.debug() << "Running QuitLyX." << endl;
+       lyxerr[Debug::INFO] << "Running QuitLyX." << endl;

 
        if (lyxrc.use_gui) {
 
        if (lyxrc.use_gui) {

-               if (!bufferlist.QwriteAll())
+               if (!bufferlist.qwriteAll())

                        return;
 
                lastfiles->writeFile(lyxrc.lastfiles);
                        return;
 
                lastfiles->writeFile(lyxrc.lastfiles);


@@ -294,7 +296,7 @@ void QuitLyX()
        bufferlist.closeAll();
 
        // do any other cleanup procedures now
        bufferlist.closeAll();
 
        // do any other cleanup procedures now

-       lyxerr.debug() << "Deleting tmp dir " << system_tempdir << endl;
+       lyxerr[Debug::INFO] << "Deleting tmp dir " << system_tempdir << endl;

 
        DestroyLyXTmpDir(system_tempdir);
 
 
        DestroyLyXTmpDir(system_tempdir);
 


@@ -390,9 +392,9 @@ Buffer * NewLyxFile(string const & filename)
                tmpname = split(tmpname, ':');
        }
 #endif
                tmpname = split(tmpname, ':');
        }
 #endif

-       lyxerr.debug() << "Arg is " << filename
-                      << "\nName is " << name
-                      << "\nTemplate is " << tmpname << endl;
+       lyxerr[Debug::INFO] << "Arg is " << filename
+                           << "\nName is " << name
+                           << "\nTemplate is " << tmpname << endl;

 
        // find a free buffer 
        Buffer * tmpbuf = bufferlist.newFile(name, tmpname);
 
        // find a free buffer 
        Buffer * tmpbuf = bufferlist.newFile(name, tmpname);


@@ -472,7 +474,7 @@ void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 void MenuInsertLabel(BufferView * bv, string const & arg)
 {
        string label(arg);
 void MenuInsertLabel(BufferView * bv, string const & arg)
 {
        string label(arg);

-       ProhibitInput(bv);
+       bv->owner()->prohibitInput();

        if (label.empty()) {
                Paragraph * par = bv->text->cursor.par();
                LyXLayout const * layout =
        if (label.empty()) {
                Paragraph * par = bv->text->cursor.par();
                LyXLayout const * layout =


@@ -520,7 +522,7 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
                InsetLabel * inset = new InsetLabel( p );
                bv->insertInset( inset );
        }
                InsetLabel * inset = new InsetLabel( p );
                bv->insertInset( inset );
        }

-       AllowInput(bv);
+       bv->owner()->allowInput();

 }
 
 
 }