From 2ecf17f0823a2042d3cd3514d09fee53aa90ef96 Mon Sep 17 00:00:00 2001
From: YWX <wxFortranIndent@163.com>
Date: Wed, 17 Jan 2018 22:52:35 +0800
Subject: [PATCH] Update for Code::Blocks Release 17.12

fix type assert error in CFortranIndentConfigDlg
---
 .gitignore                         |  1 +
 CFortranIndentConfigDlg.cpp        |  6 ++--
 FormatFortranIndentPlugin-unix.cbp | 26 +++++++-------
 FormatFortranIndentPlugin.cbp      | 55 +++++++++++++++++++-----------
 FormatFortranIndentPlugin.xrc      |  4 +--
 5 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3464c87..3d28f47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 *.[oa]
 *.obj
 # Ignore build
+cbplugin
 *.dll
 *.so
 *.zip
diff --git a/CFortranIndentConfigDlg.cpp b/CFortranIndentConfigDlg.cpp
index b199799..390859b 100644
--- a/CFortranIndentConfigDlg.cpp
+++ b/CFortranIndentConfigDlg.cpp
@@ -52,7 +52,7 @@ void CFortranIndentConfigDlg::LoadSettings()
     XRCCTRL(*this, "cb_UseTab", wxCheckBox)->SetValue( myFortranIndentConfig.isUseTab );
 	XRCCTRL(*this, "cb_UseTab", wxCheckBox)->Enable( ! myFortranIndentConfig.isSameAsEditor );
     XRCCTRL(*this, "sp_TabWidth", wxSpinCtrl)->SetValue( myFortranIndentConfig.iTabWidth );
-	XRCCTRL(*this, "sp_TabWidth", wxCheckBox)->Enable( ! ( myFortranIndentConfig.isSameAsEditor || myFortranIndentConfig.isUseTab ) );
+	XRCCTRL(*this, "sp_TabWidth", wxSpinCtrl)->Enable( ! ( myFortranIndentConfig.isSameAsEditor || myFortranIndentConfig.isUseTab ) );
     XRCCTRL(*this, "cb_KeepBlankLineOnly", wxCheckBox)->SetValue( myFortranIndentConfig.isKeepBlankLineOnly );
     XRCCTRL(*this, "cb_TrimLineFromRight", wxCheckBox)->SetValue( myFortranIndentConfig.isTrimLineFromRight );
     XRCCTRL(*this, "rb_PreprocessorType", wxRadioBox)->SetSelection( myFortranIndentConfig.iPreprocessorType );
@@ -75,11 +75,11 @@ void CFortranIndentConfigDlg::OnIsSameAsEditorClick(wxCommandEvent& event)
     bool isSameAsEditor = XRCCTRL(*this, "cb_SameAsEditor", wxCheckBox)->GetValue();
     XRCCTRL(*this, "cb_UseTab", wxCheckBox)->Enable( ! ( isSameAsEditor ) );
     bool isUseTab = XRCCTRL(*this, "cb_UseTab", wxCheckBox)->GetValue();
-    XRCCTRL(*this, "sp_TabWidth", wxCheckBox)->Enable( ! ( isSameAsEditor || isUseTab ) );
+    XRCCTRL(*this, "sp_TabWidth", wxSpinCtrl)->Enable( ! ( isSameAsEditor || isUseTab ) );
 }
 
 void CFortranIndentConfigDlg::OnIsUseTabClick(wxCommandEvent& event)
 {
     ///
-    XRCCTRL(*this, "sp_TabWidth", wxCheckBox)->Enable( ! ( XRCCTRL(*this, "cb_UseTab", wxCheckBox)->GetValue() ) );
+    XRCCTRL(*this, "sp_TabWidth", wxSpinCtrl)->Enable( ! ( XRCCTRL(*this, "cb_UseTab", wxCheckBox)->GetValue() ) ); // event.IsChecked()
 }
diff --git a/FormatFortranIndentPlugin-unix.cbp b/FormatFortranIndentPlugin-unix.cbp
index 1448cc3..2d30501 100644
--- a/FormatFortranIndentPlugin-unix.cbp
+++ b/FormatFortranIndentPlugin-unix.cbp
@@ -7,19 +7,16 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Unix Release">
-				<Option output="FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
-				<Option object_output=".objs/release" />
+				<Option output="cbplugin/unix/release/FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
+				<Option object_output=".objs/unix/release" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option host_application="codeblocks" />
 				<Option run_host_application_in_terminal="0" />
 				<Compiler>
-					<Add option="-ansi" />
 					<Add option="-O2" />
 					<Add option="`pkg-config --cflags codeblocks`" />
 					<Add option="`wx-config --cflags`" />
-					<Add option="-fPIC" />
-					<Add option="-DEXPORT_FUNC" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -27,37 +24,38 @@
 					<Add option="`wx-config --libs`" />
 				</Linker>
 				<ExtraCommands>
-					<Add after="zip -j9 FormatFortranIndentPlugin.zip manifest.xml FormatFortranIndentPlugin.xrc" />
-					<Add after="zip -j9 FormatFortranIndentPlugin.cbplugin FormatFortranIndentPlugin.so FormatFortranIndentPlugin.zip  FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip manifest.xml FormatFortranIndentPlugin.xrc" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).cbplugin $(TARGET_OUTPUT_FILE) $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
 					<Mode after="always" />
 				</ExtraCommands>
 			</Target>
 			<Target title="Unix Debug">
-				<Option output="FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
-				<Option object_output=".objs/debug" />
+				<Option output="cbplugin/unix/debugult/FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
+				<Option object_output=".objs/unix/debug" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option host_application="codeblocks" />
 				<Option run_host_application_in_terminal="0" />
 				<Compiler>
-					<Add option="-ansi" />
 					<Add option="-g" />
 					<Add option="`pkg-config --cflags codeblocks`" />
 					<Add option="`wx-config --cflags`" />
-					<Add option="-fPIC" />
-					<Add option="-DEXPORT_FUNC" />
 				</Compiler>
 				<Linker>
 					<Add option="`pkg-config --libs codeblocks`" />
 					<Add option="`wx-config --libs`" />
 				</Linker>
 				<ExtraCommands>
-					<Add after="zip -j9 FormatFortranIndentPlugin.zip manifest.xml FormatFortranIndentPlugin.xrc" />
-					<Add after="zip -j9 FormatFortranIndentPlugin.cbplugin FormatFortranIndentPlugin.so FormatFortranIndentPlugin.zip  FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip manifest.xml FormatFortranIndentPlugin.xrc" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).cbplugin $(TARGET_OUTPUT_FILE) $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
 					<Mode after="always" />
 				</ExtraCommands>
 			</Target>
 		</Build>
+		<Compiler>
+			<Add option="-std=c++11" />
+			<Add option="-fPIC" />
+		</Compiler>
 		<Unit filename="CFortranIndentConfigDlg.cpp" />
 		<Unit filename="CFortranIndentConfigDlg.h" />
 		<Unit filename="CMyFortranIndentConfig.cpp" />
diff --git a/FormatFortranIndentPlugin.cbp b/FormatFortranIndentPlugin.cbp
index defb206..76e5441 100644
--- a/FormatFortranIndentPlugin.cbp
+++ b/FormatFortranIndentPlugin.cbp
@@ -7,8 +7,8 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Win32 Release">
-				<Option output="FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
-				<Option object_output=".objs/Release" />
+				<Option output="cbplugin/win/release/FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
+				<Option object_output=".objs/win/release" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option host_application="$(#cb)/devel/codeblocks.exe" />
@@ -20,6 +20,7 @@
 					<Add option="-fmessage-length=0" />
 					<Add option="-fexceptions" />
 					<Add option="-Winvalid-pch" />
+					<Add option="-std=gnu++11" />
 					<Add option="-DBUILDING_PLUGIN" />
 					<Add option="-DHAVE_W32API_H" />
 					<Add option="-D__WXMSW__" />
@@ -28,6 +29,7 @@
 					<Add option="-DWX_PRECOMP" />
 					<Add option="-DwxUSE_UNICODE" />
 					<Add directory="$(#cb)/include" />
+					<Add directory="$(#cb)/include/tinyxml" />
 					<Add directory="$(#cb)/sdk/wxscintilla/include" />
 					<Add directory="$(#wx.include)" />
 					<Add directory="$(#wx.lib)/gcc_dll/mswu" />
@@ -41,14 +43,14 @@
 					<Add directory="$(#wx.lib)/gcc_dll" />
 				</Linker>
 				<ExtraCommands>
-					<Add after="zip -j9 FormatFortranIndentPlugin.zip manifest.xml FormatFortranIndentPlugin.xrc" />
-					<Add after="zip -j9 FormatFortranIndentPlugin.cbplugin FormatFortranIndentPlugin.dll FormatFortranIndentPlugin.zip FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip manifest.xml FormatFortranIndentPlugin.xrc" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).cbplugin $(TARGET_OUTPUT_FILE) $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
 					<Mode after="always" />
 				</ExtraCommands>
 			</Target>
 			<Target title="Win32 Debug">
-				<Option output="FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
-				<Option object_output=".objs/Debug" />
+				<Option output="cbplugin/win/debug/FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
+				<Option object_output=".objs/win/debug" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option host_application="$(#cb)/devel/codeblocks.exe" />
@@ -60,6 +62,7 @@
 					<Add option="-fmessage-length=0" />
 					<Add option="-fexceptions" />
 					<Add option="-Winvalid-pch" />
+					<Add option="-std=gnu++11" />
 					<Add option="-DBUILDING_PLUGIN" />
 					<Add option="-DHAVE_W32API_H" />
 					<Add option="-D__WXMSW__" />
@@ -69,6 +72,7 @@
 					<Add option="-DWX_PRECOMP" />
 					<Add option="-DwxUSE_UNICODE" />
 					<Add directory="$(#cb)/include" />
+					<Add directory="$(#cb)/include/tinyxml" />
 					<Add directory="$(#cb)/sdk/wxscintilla/include" />
 					<Add directory="$(#wx.include)" />
 					<Add directory="$(#wx.lib)/gcc_dll/mswu" />
@@ -81,59 +85,70 @@
 					<Add directory="$(#wx.lib)/gcc_dll" />
 				</Linker>
 				<ExtraCommands>
-					<Add after="zip -j9 FormatFortranIndentPlugin.zip manifest.xml FormatFortranIndentPlugin.xrc" />
-					<Add after="zip -j9 FormatFortranIndentPlugin.cbplugin FormatFortranIndentPlugin.dll FormatFortranIndentPlugin.zip FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip manifest.xml FormatFortranIndentPlugin.xrc" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).cbplugin $(TARGET_OUTPUT_FILE) $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
 					<Mode after="always" />
 				</ExtraCommands>
 			</Target>
 			<Target title="Unix Release">
-				<Option output="FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
-				<Option object_output=".objs/release" />
+				<Option output="cbplugin/unix/release/FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
+				<Option object_output=".objs/unix/release" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option host_application="codeblocks" />
 				<Option run_host_application_in_terminal="0" />
 				<Compiler>
-					<Add option="-ansi" />
+					<Add option="-std=c++11" />
 					<Add option="-O2" />
 					<Add option="`pkg-config --cflags codeblocks`" />
 					<Add option="`wx-config --cflags`" />
 					<Add option="-fPIC" />
-					<Add option="-DEXPORT_FUNC" />
+					<Add directory="$(#cb)/include" />
+					<Add directory="$(#cb)/include/tinyxml" />
+					<Add directory="$(#cb)/sdk/wxscintilla/include" />
+					<Add directory="$(#cb)/include/codeblocks" />
+					<Add directory="$(#cb)/include/codeblocks/wxscintilla/include" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
 					<Add option="`pkg-config --libs codeblocks`" />
 					<Add option="`wx-config --libs`" />
+					<Add library="codeblocks" />
+					<Add directory="$(#cb)/devel" />
 				</Linker>
 				<ExtraCommands>
-					<Add after="zip -j9 FormatFortranIndentPlugin.zip manifest.xml FormatFortranIndentPlugin.xrc" />
-					<Add after="zip -j9 FormatFortranIndentPlugin.cbplugin FormatFortranIndentPlugin.so FormatFortranIndentPlugin.zip  FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip manifest.xml FormatFortranIndentPlugin.xrc" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).cbplugin $(TARGET_OUTPUT_FILE) $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
 					<Mode after="always" />
 				</ExtraCommands>
 			</Target>
 			<Target title="Unix Debug">
-				<Option output="FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
-				<Option object_output=".objs/debug" />
+				<Option output="cbplugin/unix/debug/FormatFortranIndentPlugin" prefix_auto="0" extension_auto="1" />
+				<Option object_output=".objs/unix/debug" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Option host_application="codeblocks" />
 				<Option run_host_application_in_terminal="0" />
 				<Compiler>
-					<Add option="-ansi" />
+					<Add option="-std=c++11" />
 					<Add option="-g" />
 					<Add option="`pkg-config --cflags codeblocks`" />
 					<Add option="`wx-config --cflags`" />
 					<Add option="-fPIC" />
-					<Add option="-DEXPORT_FUNC" />
+					<Add directory="$(#cb)/include" />
+					<Add directory="$(#cb)/include/tinyxml" />
+					<Add directory="$(#cb)/sdk/wxscintilla/include" />
+					<Add directory="$(#cb)/include/codeblocks" />
+					<Add directory="$(#cb)/include/codeblocks/wxscintilla/include" />
 				</Compiler>
 				<Linker>
 					<Add option="`pkg-config --libs codeblocks`" />
 					<Add option="`wx-config --libs`" />
+					<Add directory="$(#cb)/devel" />
 				</Linker>
 				<ExtraCommands>
-					<Add after="zip -j9 FormatFortranIndentPlugin.zip manifest.xml FormatFortranIndentPlugin.xrc" />
-					<Add after="zip -j9 FormatFortranIndentPlugin.cbplugin FormatFortranIndentPlugin.so FormatFortranIndentPlugin.zip  FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip manifest.xml FormatFortranIndentPlugin.xrc" />
+					<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).cbplugin $(TARGET_OUTPUT_FILE) $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip FormatFortranIndentPlugin.png FormatFortranIndentPlugin-off.png" />
 					<Mode after="always" />
 				</ExtraCommands>
 			</Target>
diff --git a/FormatFortranIndentPlugin.xrc b/FormatFortranIndentPlugin.xrc
index 32ad4bb..e6ce54e 100644
--- a/FormatFortranIndentPlugin.xrc
+++ b/FormatFortranIndentPlugin.xrc
@@ -10,8 +10,7 @@
 					<orient>wxVERTICAL</orient>
 					<object class="sizeritem">
 						<object class="wxCheckBox" name="cb_SameAsEditor">
-							<label>Config Same As CB Editor</label>
-							<checked>1</checked>
+							<label>Config Same As Code::Blocks Editor</label>
 						</object>
 						<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
 						<border>8</border>
@@ -19,7 +18,6 @@
 					<object class="sizeritem">
 						<object class="wxCheckBox" name="cb_UseTab">
 							<label>Use Tabs instead of spaces</label>
-							<checked>1</checked>
 						</object>
 						<flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
 						<border>8</border>