This patch fixes the qt3 frontend and hopefully also the gtk frontend.
Abdel.
Index: frontends/gtk/GView.C
===================================================================
--- frontends/gtk/GView.C (revision 14419)
+++ frontends/gtk/GView.C (working copy)
@@ -98,7 +98,6 @@
focus_command_buffer.connect(
boost::bind(&GMiniBuffer::editMode, minibuffer_.get()));
- view_state_changed.connect(boost::bind(&GView::showViewState, this));
signal_focus_in_event().connect(sigc::mem_fun(*this,
&GView::onFocusIn));
//
int width = 750;
@@ -177,7 +176,7 @@
}
-void GView::showViewState()
+void GView::updateStatusBar()
{
message(getLyXFunc().viewStatusMessage());
}
Index: frontends/gtk/GView.h
===================================================================
--- frontends/gtk/GView.h (revision 14418)
+++ frontends/gtk/GView.h (working copy)
@@ -55,9 +55,10 @@
// returns true if this view has the focus.
virtual bool hasFocus() const;
+ ///
+ void updateStatusBar();
private:
- void showViewState();
bool onFocusIn(GdkEventFocus * event);
virtual void setWindowTitle(std::string const & t, std::string const &
it);
Index: frontends/LyXView.C
===================================================================
--- frontends/LyXView.C (revision 14419)
+++ frontends/LyXView.C (working copy)
@@ -98,6 +98,12 @@
}
+WorkArea * LyXView::workArea()
+{
+ return work_area_;
+}
+
+
void LyXView::init()
{
updateLayoutChoice();
Index: frontends/LyXView.h
===================================================================
--- frontends/LyXView.h (revision 14419)
+++ frontends/LyXView.h (working copy)
@@ -160,6 +160,11 @@
/// Temporary method used by the kernel to redraw the work area.
virtual void redrawWorkArea();
+
+ /// Temporary method to access the current workArea.
+ /// This is needed for the qt3 and gtk frontend.
+ lyx::frontend::WorkArea * workArea();
+
protected:
/// current work area (screen view of a BufferView).
/**
Index: frontends/qt3/QtView.C
===================================================================
--- frontends/qt3/QtView.C (revision 14418)
+++ frontends/qt3/QtView.C (working copy)
@@ -81,7 +81,6 @@
statusBar()->setSizeGripEnabled(false);
- view_state_changed.connect(boost::bind(&QtView::update_view_state,
this));
connect(&statusbar_timer_, SIGNAL(timeout()), this,
SLOT(update_view_state_qt()));
// make sure the buttons are disabled if needed
@@ -137,7 +136,7 @@
}
-void QtView::update_view_state()
+void QtView::updateStatusBar()
{
// let the user see the explicit message
if (statusbar_timer_.isActive())
Index: frontends/qt3/QtView.h
===================================================================
--- frontends/qt3/QtView.h (revision 14418)
+++ frontends/qt3/QtView.h (working copy)
@@ -80,13 +80,12 @@
protected:
/// make sure we quit cleanly
virtual void closeEvent(QCloseEvent * e);
+ /// update status bar
+ void updateStatusBar();
private:
/// focus the command buffer widget
void focus_command_widget();
- /// update status bar
- void update_view_state();
-
/**
* setWindowTitle - set title of window
* @param t main window title
Index: frontends/WorkArea.h
===================================================================
--- frontends/WorkArea.h (revision 14418)
+++ frontends/WorkArea.h (working copy)
@@ -97,12 +97,13 @@
/// grey out (no buffer)
void greyOut();
+ /// FIXME: should be protected, public until the qt3 and gtk frontends
are
+ /// cleaned up.
+ void processKeySym(LyXKeySymPtr key, key_modifier::state state);
+
protected:
/// cause the display of the given area of the work area
virtual void expose(int x, int y, int w, int h) = 0;
-
- ///
- void processKeySym(LyXKeySymPtr key, key_modifier::state state);
///
void dispatch(FuncRequest const & cmd0);
