diff kdiff3/src/directorymergewindow.h @ 53:32d5cbf9db71

Corrections for 0.9.81:
- Fix for configure --enable-final
- Bugfixes
- First steps towards internationalisation

--- a/kdiff3/src/directorymergewindow.h	Tue Dec 09 20:34:32 2003 +0000
+++ b/kdiff3/src/directorymergewindow.h	Tue Jan 20 20:19:59 2004 +0000
@@ -140,9 +140,12 @@
    int totalColumnWidth();
    bool isSyncMode() { return m_bSyncMode; }
    void initDirectoryMergeActions( QObject* pKDiff3App, KActionCollection* ac );
-   void updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible );
+   void updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible,
+      KToggleAction* chooseA, KToggleAction* chooseB, KToggleAction* chooseC );
 
    virtual void keyPressEvent( QKeyEvent* e );
+   virtual void focusInEvent( QFocusEvent* e );
+   virtual void focusOutEvent( QFocusEvent* e );
 
 public slots:
    void reload();
@@ -278,6 +281,7 @@
 
 class DirectoryMergeInfo : public QFrame
 {
+   Q_OBJECT
 public:
    DirectoryMergeInfo( QWidget* pParent );
    void setInfo(