removed a warning from screen and added CFLAGS in lyx.spec.in.

[lyx.git] / src / filedlg.h

diff --git a/src/filedlg.h b/src/filedlg.h
index 22e6f2136fb74e7f05ab629a0f30980810c1d115..a6dbfb154f13a85a1f96dda1a761a653f4ab5588 100644 (file)
--- a/src/filedlg.h
+++ b/src/filedlg.h
@@ -1,16 +1,16 @@
 // -*- C++ -*-
 /* This file is part of
-* ======================================================
-* 
-*           LyX, The Document Processor
-*        
-*           Copyright (C) 1995 1996 Matthias Ettrich
-*           and the LyX Team.
-*
-*======================================================*/
-
-#ifndef __FILEDLG_H__
-#define __FILEDLG_H__
+ * ======================================================
+ * 
+ *           LyX, The Document Processor
+ *        
+ *           Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-1999 The LyX Team.
+ *
+ * ======================================================*/
+
+#ifndef FILEDLG_H
+#define FILEDLG_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -84,9 +84,10 @@ private:
        string pszName;
        string pszDisplayed;
        string pszLsEntry;
+       LyXDirEntry() {};
+public:
        /// compares two LyXDirEntry objects content (used by qsort)
        static int ldeCompProc(const LyXDirEntry *r1, const LyXDirEntry *r2);
-       LyXDirEntry() {};
 };
 
 
@@ -112,6 +113,8 @@ public:
        static void FileDlgCB(FL_OBJECT *, long);
        /// Callback for double click in list
        static void DoubleClickCB(FL_OBJECT *, long);
+       /// Handle Cancel CB from WM close
+       static int CancelCB(FL_FORM *, void *);
 private:
        // data
        static FD_FileDlg *pFileDlgForm;
@@ -148,8 +151,6 @@ private:
        bool HandleDoubleClick();
        /// Handle OK button call
        bool HandleOK();
-       /// Handle Cancel CB from WM close
-       static int CancelCB(FL_FORM *, void *);
        /// Simulates a click on OK/Cancel
        void Force(bool);
 };