Project updated with ReaderOpenEx function and tested. added new compiled bin…

Project updated with ReaderOpenEx function and tested. added new compiled bin folders. deleted lib submodule

Project updated with ReaderOpenEx function and tested. added new compiled bin…
1776ba42 · developer33 · a4ff85cb · 1776ba42 · 1776ba42 · 1776ba42
28 changed files
--- a/bin/Debug/mfp_wxwidgets.exe
+++ b/bin/Debug/mfp_wxwidgets.exe
--- a/bin/Debug/uFCoder-x86.dll
+++ b/bin/Debug/uFCoder-x86.dll
--- a/bin/Debug/wxmsw30u_gcc_gcc540w64.dll
+++ b/bin/Debug/wxmsw30u_gcc_gcc540w64.dll
--- a/bin/Debug/wxmsw311u_gcc_custom.dll
+++ b/bin/Debug/wxmsw311u_gcc_custom.dll
--- a/bin/Debug/wxmsw311u_gl_gcc_custom.dll
+++ b/bin/Debug/wxmsw311u_gl_gcc_custom.dll
--- a/bin/Release/mfp_wxwidgets.exe
+++ b/bin/Release/mfp_wxwidgets.exe
--- a/bin/Release/uFCoder-x86.dll
+++ b/bin/Release/uFCoder-x86.dll
--- a/bin/Release/wxmsw30u_gcc_gcc540w64.dll
+++ b/bin/Release/wxmsw30u_gcc_gcc540w64.dll
--- a/bin/Release/wxmsw311u_gcc_custom.dll
+++ b/bin/Release/wxmsw311u_gcc_custom.dll
--- a/bin/Release/wxmsw311u_gl_gcc_custom.dll
+++ b/bin/Release/wxmsw311u_gl_gcc_custom.dll
--- a/mfp_wxwidgets.cbp
+++ b/mfp_wxwidgets.cbp
@@ -14,14 +14,21 @@
 projectLinkerOptionsRelation="2"/>

 option=”- - -g"/>
-directory="C:/wxWidgets-3.1.1/lib/gcc_dll/mswu"/>
+directory="C:/wxWidgets-3.0.3/lib/gcc_dll/mswu"/>


-directory="C:/wxWidgets-3.1.1/lib/gcc_dll/mswu"/>
+directory="C:/wxWidgets-3.0.3/lib/gcc_dll/mswu"/>


-library="libwxmsw31u.a"/>
-directory="C:/wxWidgets-3.1.1/lib/gcc_dll"/>
+option=”- - -static-libstdc++"/>
+option=”- - -static-libgcc"/>
+option=”- - -static -lpthread"/>
+library="libwxmsw30u.a"/>
+library="libwxpng.a"/>
+library="libwxjpeg.a"/>
+library="libwxtiff.a"/>
+library="libwxzlib.a"/>
+directory="C:/wxWidgets-3.0.3/lib/gcc_dll"/>


 title="Release">
@@ -32,15 +39,22 @@
 projectLinkerOptionsRelation="2"/>

 option=”- - -O2"/>
-directory="C:/wxWidgets-3.1.1/lib/gcc_dll/mswu"/>
+directory="C:/wxWidgets-3.0.3/lib/gcc_dll/mswu"/>


-directory="C:/wxWidgets-3.1.1/lib/gcc_dll/mswu"/>
+directory="C:/wxWidgets-3.0.3/lib/gcc_dll/mswu"/>


 option=”- - -s"/>
-library="libwxmsw31u.a"/>
-directory="C:/wxWidgets-3.1.1/lib/gcc_dll"/>
+option=”- - -static-libstdc++"/>
+option=”- - -static-libgcc"/>
+option=”- - -static -lpthread"/>
+library="libwxmsw30u.a"/>
+library="libwxpng.a"/>
+library="libwxjpeg.a"/>
+library="libwxtiff.a"/>
+library="libwxzlib.a"/>
+directory="C:/wxWidgets-3.0.3/lib/gcc_dll"/>



@@ -48,18 +62,33 @@
 option=”- - -Wall"/>
 option=”- - -pipe"/>
 option=”- - -mthreads"/>
+option=”- - -std=c++11"/>
 option=”- - -D__GNUWIN32__"/>
 option=”- - -D__WXMSW__"/>
 option=”- - -DWXUSINGDLL"/>
 option=”- - -DwxUSE_UNICODE"/>
-directory="C:/wxWidgets-3.1.1/include"/>
+directory="C:/wxWidgets-3.0.3/include"/>


-directory="C:/wxWidgets-3.1.1/include"/>
+directory="C:/wxWidgets-3.0.3/include"/>


 option=”- - -mthreads"/>
+option=”- - -Wl,--enable-stdcall-fixup"/>
 library="ufr-lib/windows/x86/uFCoder-x86.dll"/>
+library="libkernel32.a"/>
+library="libuser32.a"/>
+library="libgdi32.a"/>
+library="libwinspool.a"/>
+library="libcomdlg32.a"/>
+library="libadvapi32.a"/>
+library="libshell32.a"/>
+library="libole32.a"/>
+library="liboleaut32.a"/>
+library="libuuid.a"/>
+library="libcomctl32.a"/>
+library="libwsock32.a"/>
+library="libodbc32.a"/>
 directory="ufr-lib/windows/x86"/>

 filename="mfp_wxwidgetsApp.cpp"/>

--- a/mfp_wxwidgets.depend
+++ b/mfp_wxwidgets.depend
--- a/mfp_wxwidgets.layout
+++ b/mfp_wxwidgets.layout
@@ -2,9 +2,29 @@

 major="1"minor="0"/>
 name="Release"/>
+name="mfp_wxwidgetsMain.h"open="1"top="1"tabpos="2"split="0"active="1"splitpos="0"zoom_1="0"zoom_2="0">
+
+position="27746"topLine="677"/>
+
+
+name="uFR.cpp"open="1"top="0"tabpos="4"split="0"active="1"splitpos="0"zoom_1="0"zoom_2="0">
+
+position="3730"topLine="99"/>
+
+
+name="uFR.h"open="1"top="0"tabpos="3"split="0"active="1"splitpos="0"zoom_1="0"zoom_2="0">
+
+position="83"topLine="0"/>
+
+
+name="mfp_wxwidgetsApp.cpp"open="1"top="0"tabpos="5"split="0"active="1"splitpos="0"zoom_1="0"zoom_2="0">
+
+position="735"topLine="0"/>
+
+
 name="mfp_wxwidgetsMain.cpp"open="1"top="0"tabpos="1"split="0"active="1"splitpos="0"zoom_1="0"zoom_2="0">

-position="299080"topLine="6148"/>
+position="300813"topLine="6280"/>



--- a/mfp_wxwidgetsApp.cpp
+++ b/mfp_wxwidgetsApp.cpp
@@ -25,7 +25,8 @@ bool mfp_wxwidgetsApp::OnInit()
 {
 mfp_wxwidgetsFrame*Frame=newmfp_wxwidgetsFrame(0);
 Frame->Show();
-SetTopWindow(Frame);
+SetTopWindow(Frame);
+
 }
 //*)
 returnwxsOK;

--- a/mfp_wxwidgetsMain.cpp
+++ b/mfp_wxwidgetsMain.cpp
--- a/mfp_wxwidgetsMain.cpp.save-failed
+++ b/mfp_wxwidgetsMain.cpp.save-failed
--- a/mfp_wxwidgetsMain.h
+++ b/mfp_wxwidgetsMain.h
--- a/obj/Debug/mfp_wxwidgetsApp.o
+++ b/obj/Debug/mfp_wxwidgetsApp.o
--- a/obj /调试/ mfp_wxwidgetsMain.o
+++ b/obj /调试/ mfp_wxwidgetsMain.o
--- a/obj/Debug/resource.res
+++ b/obj/Debug/resource.res
--- a/obj/Debug/uFR.o
+++ b/obj/Debug/uFR.o
--- a/obj/Release/mfp_wxwidgetsApp.o
+++ b/obj/Release/mfp_wxwidgetsApp.o
--- a/obj/Release/mfp_wxwidgetsMain.o
+++ b/obj/Release/mfp_wxwidgetsMain.o
--- a/obj/Release/resource.res
+++ b/obj/Release/resource.res
--- a/obj/Release/uFR.o
+++ b/obj/Release/uFR.o
--- a/uFR.h
+++ b/uFR.h
@@ -2,6 +2,8 @@
 #include 
 #include 
 #include 
+#include 
+

 classUFR{


--- a/ufr-lib@1bb26e64
+++ b/ufr-lib@1bb26e64
-Subproject commit 1bb26e641e5916a89010edb469dc5fa6fa94fa91
--- a/wxsmith/mfp_wxwidgetsframe.wxs
+++ b/wxsmith/mfp_wxwidgetsframe.wxs
@@ -6,6 +6,102 @@
 class=“wxStaticBoxSizer”variable="StaticBoxSizer1"member="no">
 wxVERTICAL
 class="sizeritem">
+class=“wxStaticBoxSizer”variable="StaticBoxSizer70"member="no">
+Reader Open
+class="sizeritem">
+class="wxButton"name="ID_BUTTON39"variable="btnReaderOpen"member="yes">
+Reader Open
+111,40
+function="OnbtnReaderOpenClick"entry="EVT_BUTTON"/>
+
+wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL
+5
+
+class="sizeritem">
+class=“wxCheckBox"name="ID_CHECKBOX1"variable="chkAdvanced"member="yes">
+Use Advanced options
+function="OnchkAdvancedClick"entry="EVT_CHECKBOX"/>
+
+wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL
+5
+
+class="sizeritem">
+class=“wxStaticBoxSizer”variable="StaticBoxSizer71"member="no">
+Advanced options
+class="sizeritem">
+class="wxStaticText"name="ID_STATICTEXT115"variable="labelReaderType"member="yes">
+Reader type:
+0
+
+wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL
+5
+
+class="sizeritem">
+class="wxTextCtrl"name="ID_TEXTCTRL53"variable="txtReaderType"member="yes">
+51,21
+0
+
+wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL
+5
+
+class="sizeritem">
+class="wxStaticText"name="ID_STATICTEXT116"variable="labelPortName"member="yes">
+Port name:
+0
+
+wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL
+5
+
+class="sizeritem">
+class="wxTextCtrl"name="ID_TEXTCTRL56"variable="txtPortName"member="yes">
+0
+
+wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL
+5
+
+class="sizeritem">
+class="wxStaticText"name="ID_STATICTEXT117"variable="labelPortInterface"member="yes">
+Port interface:
+0
+
+wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL
+5
+
+class="sizeritem">
+class="wxTextCtrl"name="ID_TEXTCTRL58"variable="txtPortInterface"member="yes">
+51,21
+0
+
+wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL
+5
+
+class="sizeritem">
+class="wxStaticText"name="ID_STATICTEXT118"variable="labelArg"member="yes">
+Arg:
+0
+
+wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL
+5
+
+class="sizeritem">
+class="wxTextCtrl"name="ID_TEXTCTRL60"variable="txtArg"member="yes">
+165年,21
+0
+
+wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL
+5
+1
+
+
+wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL
+5
+1
+
+
+wxALL|wxALIGN_LEFT
+5
+
+class="sizeritem">
 class="wxBoxSizer"variable="BoxSizer1"member="no">
 class="sizeritem">
 class="wxStaticText"name="ID_STATICTEXT1"variable="StaticText1"member="yes">
@@ -6496,10 +6592,6 @@
 -1
 wxSB_NORMAL

-class="wxTimer"name="ID_TIMER1"variable="Timer1"member="yes">
-100
-function="OnTimer1Trigger"entry="EVT_TIMER"/>
-
 class="wxTimer"name=“ID_TIMER2”variable="Timer2"member="yes">
 200
 function="OnTimer2Trigger"entry="EVT_TIMER"/>