From c174e491fb6a5413ea8dbbb3571cc852df3d6a2e Mon Sep 17 00:00:00 2001
From: Alexey Uzhva
Date: Mon, 16 Apr 2007 18:20:24 +0000
Subject: bugfixes

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@502 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/dockwidget/dockwidget_QT4_vc05.vcproj | 6 ++----
 src/modules/dockwidget/libkvidockwidget_qt3.cpp   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/modules/dockwidget')

diff --git a/src/modules/dockwidget/dockwidget_QT4_vc05.vcproj b/src/modules/dockwidget/dockwidget_QT4_vc05.vcproj
index 339f0a85f..fe042ebdd 100644
--- a/src/modules/dockwidget/dockwidget_QT4_vc05.vcproj
+++ b/src/modules/dockwidget/dockwidget_QT4_vc05.vcproj
@@ -62,12 +62,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="qtmain.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib msvcrt.lib perl58.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib qt3supportd4.lib qtcored4.lib qtnetworkd4.lib qtguid4.lib "
+				AdditionalDependencies="qt3supportD4.lib qtcoreD4.lib qtnetworkD4.lib qtguiD4.lib qtmainD.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib kernel32.lib user32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib winmm.lib"
 				OutputFile="$(OutDir)/kvi$(ProjectName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(SSLLIBDIR)&quot;;&quot;$(PERLDIR)\lib\CORE&quot;;&quot;$(QTDIR)\lib&quot;;&quot;$(SolutionDir)\win32build\bin&quot;;&quot;$(ZLIBLIBDIR)&quot;"
 				GenerateManifest="true"
-				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/dockwidget.pdb"
 				SubSystem="2"
@@ -140,7 +139,7 @@
 				StringPooling="true"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -162,7 +161,6 @@
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(SSLLIBDIR)&quot;;&quot;$(PERLDIR)\lib\CORE&quot;;&quot;$(QTDIR)\lib&quot;;&quot;$(SolutionDir)\win32build\bin&quot;;&quot;$(ZLIBLIBDIR)&quot;"
 				GenerateManifest="true"
-				IgnoreAllDefaultLibraries="true"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index 3e2b9c53b..50e31cb04 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -483,7 +483,7 @@ void KviDockWidget::toggleParentFrame()
 		top_widget->show();
 		top_widget->raise();
 		top_widget->setActiveWindow();
-		m_pFrm->setFocus();
+		if(g_pActiveWindow) g_pActiveWindow->setFocus();
 		if(m_pFrm->isMinimized())
 			m_pFrm->showNormal();
 		else
-- 
cgit v1.3.1-10-gc9f91