some win32 related fixes (should fix #513, #586)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3529 17fca916-40b9-46aa-a4ea-0a15b648b75c

3 files changed, 19 insertions, 57 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29ff9d7c4..ad177c3a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -830,12 +830,13 @@ IF(WIN32)
 ENDIF()
 
 IF(MINGW)
-        ADD_DEFINITIONS(-DMINGW -DCOMPILE_USE_STANDALONE_MOC_SOURCES -mwindows)
         LIST(APPEND LIBS -lshlwapi)
 	IF(WANT_DEBUG)
                 SET(ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS} -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc -fno-exceptions")
+				ADD_DEFINITIONS(-DMINGW -DCOMPILE_USE_STANDALONE_MOC_SOURCES)
         ELSE()
                 SET(ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS} -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc -mwindows -fno-exceptions")
+				ADD_DEFINITIONS(-DMINGW -DCOMPILE_USE_STANDALONE_MOC_SOURCES -mwindows)
 	ENDIF()
         #remove leading and trailing spaces (string strip)
         STRING(REGEX REPLACE "(^( )+|( )+$)" "" ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS}")
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index ffec1365e..5eac8bba0 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -60,18 +60,6 @@
 	extern QPixmap * g_pShadedChildGlobalDesktopBackground;
 #endif
 
-
-#define KVI_MDI_NORESIZE 0
-#define KVI_MDI_RESIZE_TOP 1
-#define KVI_MDI_RESIZE_LEFT 2
-#define KVI_MDI_RESIZE_RIGHT 4
-#define KVI_MDI_RESIZE_BOTTOM 8
-#define KVI_MDI_RESIZE_TOPLEFT (1|2)
-#define KVI_MDI_RESIZE_TOPRIGHT (1|4)
-#define KVI_MDI_RESIZE_BOTTOMLEFT (8|2)
-#define KVI_MDI_RESIZE_BOTTOMRIGHT (8|4)
-
-
 KviMdiChild::KviMdiChild(KviMdiManager * par, const char * name)
 : QMdiSubWindow()
 {
@@ -81,7 +69,6 @@ KviMdiChild::KviMdiChild(KviMdiManager * par, const char * name)
 
 	m_pClient = 0;
 
-// 	connect(this, SIGNAL(windowStateChanged(Qt::WindowStates,Qt::WindowStates)), this, SLOT(windowStateChangedEvent(Qt::WindowStates,Qt::WindowStates)));
 	connect(this, SIGNAL(minimizeSignal()), this, SLOT(minimize()), Qt::QueuedConnection);
 	connect(this, SIGNAL(restoreSignal()), this, SLOT(restore()), Qt::QueuedConnection);
 	connect(this, SIGNAL(maximizeSignal()), this, SLOT(maximize()), Qt::QueuedConnection);
diff --git a/win32build/KVIrc.nsi b/win32build/KVIrc.nsi
index aedfb9bc0..401a0b9b9 100644
--- a/win32build/KVIrc.nsi
+++ b/win32build/KVIrc.nsi
@@ -6,7 +6,7 @@
 !include "LogicLib.nsh"
 
 Name "KVIrc"
-!define VERSION '4.0.0-wip'
+!define VERSION '4.0.0-rc1'
 !define RELEASE_NAME 'Insomnia (wip)'
 !define /date RELEASE_VERSION '%Y%m%d'
 !define URL_ABOUT 'http://www.kvirc.net/'
@@ -63,8 +63,6 @@ LangString KVIrc ${LANG_ENGLISH} "KVIrc (required)"
 LangString KVIrcDescr ${LANG_ENGLISH} "KVIrc program files"
 LangString StartMenuSection ${LANG_ENGLISH} "Start menu"
 LangString StartMenuSectionDescr ${LANG_ENGLISH} "Create start menu icon"
-LangString WinampSection ${LANG_ENGLISH} "Winamp plugin"
-LangString WinampSectionDescr ${LANG_ENGLISH} "Install Winamp plugin"
 LangString AutostartSection ${LANG_ENGLISH} "Autostart"
 LangString AutostartSectionDescr ${LANG_ENGLISH} "Start program when user login"
 LangString MsgUninstallOldInstaller ${LANG_ENGLISH} "Previous versions of KVIrc must to be uninstalled."
@@ -75,29 +73,6 @@ LangString KVIrcIsRunning ${LANG_ENGLISH} "An instance of KVIrc is currently run
 ;--------------------------------
 ; Sections
 
-Section -RemovePreviousInstallation
-    SetShellVarContext all
-    ; Remove old installer
-    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\KVIrc_is1" "InstallLocation"
-    StrLen $R1 "$R0"
-    ${If} $R1 > 0
-	${If} "$R0" != "$INSTDIR"
-	    IfFileExists "$R0\unins000.exe" 0 +3
-	    MessageBox MB_OK "$(MsgUninstallOldInstaller)"
-	    ExecWait "$R0\unins000.exe"
-	${EndIf}
-	DeleteRegKey  HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\KVIrc_is1"
-    ${EndIf}
-
-    ; Remove previous installation
-;	ReadRegStr $R2 HKLM SOFTWARE\KVIrc "Install_Dir"
-;	IfFileExists $R2\uninstall.exe 0 noinst
-;		ExecWait "$INSTDIR\kvirc.exe -x exit"
-;		Sleep 5000
-;	noinst:
-    RMDir "$SMPROGRAMS\KVIrc"
-SectionEnd
-
 Section !$(KVIrc) KVIrc_IDX
 
 	SectionIn RO
@@ -176,12 +151,6 @@ Section /o $(AutostartSection) AutostartSection_IDX
   Call AddAutostart
 SectionEnd
 
-Section $(WinampSection) WinampSection_IDX
-ReadRegStr $R0 HKCU Software\Winamp ""
-	IfFileExists "$R0\winamp.exe" 0 +2
-	  	Rename "$INSTDIR\modules\gen_kvirc.dll" "$R0\Plugins\gen_kvirc.dll"
-SectionEnd
-
 ;--------------------------------
 ; Descriptions
 
@@ -196,8 +165,6 @@ SectionEnd
         $(TraySectionDescr)
 !insertmacro MUI_DESCRIPTION_TEXT ${AutostartSection_IDX} \
         $(AutostartSectionDescr)
-!insertmacro MUI_DESCRIPTION_TEXT ${WinampSection_IDX} \
-        $(WinampSectionDescr)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 
@@ -206,10 +173,22 @@ Function .onInit
 
 	Call CloseKVIrcInstances
 
-	ReadRegStr $R0 HKCU Software\Winamp ""
-	IfFileExists "$R0\winamp.exe" continue 0
-		SectionSetFlags ${WinampSection_IDX} 16 # 10000 in binary: disabled+unchecked
-continue:
+    SetShellVarContext all
+    ; Remove old installer
+    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\KVIrc" "UninstallString"
+    StrCmp $R0 "" done
+
+    MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "$(MsgUninstallOldInstaller)" IDOK uninst
+    Abort
+ 
+    ;Run the uninstaller
+uninst:
+    ClearErrors
+    ExecWait "$R0"
+	DeleteRegKey  HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\KVIrc"
+    RMDir "$SMPROGRAMS\KVIrc"  
+ 
+done:
 
 FunctionEnd
 
@@ -234,11 +213,6 @@ Section !un.$(UnGeneralFiles)
   ; Remove directories used
   RMDir "$SMPROGRAMS\KVIrc"
   RMDir /r "$INSTDIR"
-
-  ReadRegStr $R0 HKCU Software\Winamp ""
-	IfFileExists "$R0\Plugins\gen_kvirc.dll" 0 +2
-	  	Delete "$R0\Plugins\gen_kvirc.dll"
-
 SectionEnd
 
 ;Remove local data dir