compile fix

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

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index ecc53849b9d54730e97960dbbfeadc26bc0fe25a..5a9559c23c448badd817ee9b5af0552e10ab049c 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -429,6 +429,7 @@ src_insets_files = Split('''
 src_frontends_header_files = Split('''
     Alert.h
     Alert_pimpl.h
 src_frontends_header_files = Split('''
     Alert.h
     Alert_pimpl.h

+    Application.h

     Clipboard.h
     Dialogs.h
     FileDialog.h
     Clipboard.h
     Dialogs.h
     FileDialog.h


@@ -453,6 +454,7 @@ src_frontends_header_files = Split('''
 
 src_frontends_files = Split('''
     Alert.C
 
 src_frontends_files = Split('''
     Alert.C

+    Application.C

     Dialogs.C
     LyXView.C
     Painter.C
     Dialogs.C
     LyXView.C
     Painter.C


@@ -1104,12 +1106,12 @@ src_frontends_qt4_moc_files = Split('''
 
 src_frontends_qt4_header_files = Split('''
     Action.h
 
 src_frontends_qt4_header_files = Split('''
     Action.h

-    Application.h

     BiblioModuleBase.h
     BulletsModule.h
     ColorCache.h
     FileDialog_private.h
     FontLoader.h
     BiblioModuleBase.h
     BulletsModule.h
     ColorCache.h
     FileDialog_private.h
     FontLoader.h

+    GuiApplication.h

     GuiClipboard.h
     GuiImplementation.h
     GuiSelection.h
     GuiClipboard.h
     GuiImplementation.h
     GuiSelection.h


@@ -1223,13 +1225,13 @@ src_frontends_qt4_header_files = Split('''
 src_frontends_qt4_files = Split('''
     Action.C
     Alert_pimpl.C
 src_frontends_qt4_files = Split('''
     Action.C
     Alert_pimpl.C

-    Application.C

     BulletsModule.C
     ColorCache.C
     Dialogs.C
     FileDialog.C
     FileDialog_private.C
     FontLoader.C
     BulletsModule.C
     ColorCache.C
     Dialogs.C
     FileDialog.C
     FileDialog_private.C
     FontLoader.C

+    GuiApplication.C

     GuiClipboard.C
     GuiImplementation.C
     GuiSelection.C
     GuiClipboard.C
     GuiImplementation.C
     GuiSelection.C

diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index b392163b973ace04d6f357988bf052f66d75bddc..fd9d691e931ab2c7003feb448efc6fa971639143 100644 (file)
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -16,6 +16,8 @@ libfrontends_la_SOURCES = \
        Alert.C \
        Alert.h \
        Alert_pimpl.h \
        Alert.C \
        Alert.h \
        Alert_pimpl.h \

+       Application.C \
+       Application.h \

        Dialogs.C \
        Dialogs.h \
        FileDialog.h \
        Dialogs.C \
        Dialogs.h \
        FileDialog.h \

diff --git a/src/frontends/qt4/GuiApplication.C b/src/frontends/qt4/GuiApplication.C
index eff55cccec626630de015ecd6524ba009223c2b2..75dcddfeb4cd3492efdd301d61899cf272e4f623 100644 (file)
--- a/src/frontends/qt4/GuiApplication.C
+++ b/src/frontends/qt4/GuiApplication.C
@@ -222,7 +222,7 @@ bool GuiApplication::x11EventFilter(XEvent * xev)
                if (buffer_view_) {
                        lyx::docstring const sel = buffer_view_->requestSelection();
                        if (!sel.empty())
                if (buffer_view_) {
                        lyx::docstring const sel = buffer_view_->requestSelection();
                        if (!sel.empty())

-                               gui_.selection().put(sel);
+                               selection_.put(sel);

                }
                break;
        case SelectionClear:
                }
                break;
        case SelectionClear:

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 73d90e2907f14e4fe3169ee5a83fe02e0ace4178..59a5f03314fad93e6ed542eb9127d1005535a2c0 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -31,11 +31,11 @@ AM_CPPFLAGS += \
 
 libqt4_la_SOURCES = \
        Alert_pimpl.C \
 
 libqt4_la_SOURCES = \
        Alert_pimpl.C \

-       Application.C Application.h \

        ColorCache.h ColorCache.C \
        Dialogs.C \
        FileDialog.C \
        FontLoader.h FontLoader.C \
        ColorCache.h ColorCache.C \
        Dialogs.C \
        FileDialog.C \
        FontLoader.h FontLoader.C \

+       GuiApplication.C GuiApplication.h \

        GuiClipboard.h GuiClipboard.C \
        GuiSelection.h GuiSelection.C \
        GuiImplementation.h GuiImplementation.C \
        GuiClipboard.h GuiClipboard.C \
        GuiSelection.h GuiSelection.C \
        GuiImplementation.h GuiImplementation.C \