small changes to ButtonController usage

[lyx.git] / src / LyXView.C

diff --git a/src/LyXView.C b/src/LyXView.C
index a6cc8adb0bdcef452855259fa1e332bb620bfd7f..2e28a73a6828f054b3b38877de24b9ccbbaf4914 100644 (file)
--- a/src/LyXView.C
+++ b/src/LyXView.C
@@ -211,7 +211,8 @@ int LyXView::atCloseMainFormCB(FL_FORM *, void *)
 
 
 // Wrapper for the above
-extern "C" int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p)
+extern "C"
+int C_LyXView_atCloseMainFormCB(FL_FORM * form, void * p)
 {
        return LyXView::atCloseMainFormCB(form, p);
 }
@@ -319,8 +320,11 @@ void LyXView::create_form_form_main(int width, int height)
 }
 
 
+#if 0
 extern "C"
 int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev);
+#endif
+
 
 void LyXView::init()
 {
@@ -337,11 +341,13 @@ void LyXView::init()
                autosave_timeout.setTimeout(lyxrc.autosave * 1000);
                autosave_timeout.start();
        }
-       
+
+#if 0
        // Install the raw callback for keyboard events 
        fl_register_raw_callback(form_,
                                 KeyPressMask,
                                 C_LyXView_KeyPressMask_raw_callback);
+#endif
         intl->InitKeyMapper(lyxrc.use_kbmap);
 }
 
@@ -395,6 +401,7 @@ void LyXView::UpdateDocumentClassChoice()
 }
 
 
+#if 0
 // This is necessary, since FL_FREE-Objects doesn't get all keypress events
 // as FL_KEYBOARD events :-(   Matthias 280596
 int LyXView::KeyPressMask_raw_callback(FL_FORM * fl, void * xev)
@@ -439,7 +446,7 @@ int LyXView::KeyPressMask_raw_callback(FL_FORM * fl, void * xev)
                // last_time_pressed is 0, that sinifies an autoreapeat
                // at least on my system. It like some feedback from
                // others, especially from user running LyX remote.
-               //lyxerr << "Syncing - purging X events." << endl;
+               lyxerr[Debug::KEY] << "Syncing - purging X events." << endl;
                XSync(fl_get_display(), 1);
                // This purge make f.ex. scrolling stop imidiatly when
                // releaseing the PageDown button. The question is if this
@@ -456,6 +463,7 @@ int C_LyXView_KeyPressMask_raw_callback(FL_FORM * fl, void * xev)
 {
        return LyXView::KeyPressMask_raw_callback(fl, xev);
 }
+#endif
 
 
 // Updates the title of the window with the filename of the current document