diff --git a/bin/Release/sector_trailer_unsafe.exe b/bin/Release/sector_trailer_unsafe.exe
index 1c6df3ebd38322d8df906425e83496aeea559fba..d5be22d2715f62fa49d125b086af24d2b51b87a5 100644
Binary files a/bin/Release/sector_trailer_unsafe.exe and b/bin/Release/sector_trailer_unsafe.exe differ
diff --git a/bin/Release/uFCoder-x86.dll b/bin/Release/uFCoder-x86.dll
index 6d9220618c4889aad37aa98f09c22146675a4200..f9a465cb2407fa117a6ed948efb171a6bbd649d2 100644
Binary files a/bin/Release/uFCoder-x86.dll and b/bin/Release/uFCoder-x86.dll differ
diff --git a/lib b/lib
index 403adb9f6ec48479385c098d7ae98caa13bbb2d7..f15ba92accf0a4055130e1e88f01777840787aad 160000
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit 403adb9f6ec48479385c098d7ae98caa13bbb2d7
+Subproject commit f15ba92accf0a4055130e1e88f01777840787aad
diff --git a/obj/Release/sector_trailer_unsafeMain.o b/obj/Release/sector_trailer_unsafeMain.o
index 16d0b4c160a2f9178e0bd0c5722c6146f430d7ec..088b6279f21c71bf09cde6231d261c39ab8cbff1 100644
Binary files a/obj/Release/sector_trailer_unsafeMain.o and b/obj/Release/sector_trailer_unsafeMain.o differ
diff --git a/sector_trailer_unsafe.cbp b/sector_trailer_unsafe.cbp
index 0e9cd9f90974bc6fd5003669005420a34adefba2..6eedae72711e0eb13fa7b5c74a304454e6cb58f8 100644
--- a/sector_trailer_unsafe.cbp
+++ b/sector_trailer_unsafe.cbp
@@ -14,14 +14,22 @@
-
+
-
+
+
+
+
+
-
+
+
+
+
+
@@ -32,22 +40,30 @@
-
+
-
+
+
+
+
+
-
+
+
+
+
+
-
-
+
+
@@ -59,7 +75,20 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sector_trailer_unsafe.depend b/sector_trailer_unsafe.depend
index e5647e7dd78a89cb8fd27940cd4b8fc8151efa5b..6f438d253086671a65400f98922b009f91c2b283 100644
--- a/sector_trailer_unsafe.depend
+++ b/sector_trailer_unsafe.depend
@@ -4037,3 +4037,42 @@
+1562059902 source:c:\users\projekat\desktop\need_repo\ufr-mf-examples-cpp-gui-unsafe_sector_trailer_write\resource.rc
+ "wx/msw/wx.rc"
+
+1562059902 source:c:\users\projekat\desktop\need_repo\ufr-mf-examples-cpp-gui-unsafe_sector_trailer_write\sector_trailer_unsafeapp.cpp
+ "sector_trailer_unsafeApp.h"
+ "sector_trailer_unsafeMain.h"
+
+
+1562059902 c:\users\projekat\desktop\need_repo\ufr-mf-examples-cpp-gui-unsafe_sector_trailer_write\sector_trailer_unsafeapp.h
+
+
+1562142267 c:\users\projekat\desktop\need_repo\ufr-mf-examples-cpp-gui-unsafe_sector_trailer_write\sector_trailer_unsafemain.h
+
+
+
+
+
+
+
+
+
+
+1562079302 source:c:\users\projekat\desktop\need_repo\ufr-mf-examples-cpp-gui-unsafe_sector_trailer_write\sector_trailer_unsafemain.cpp
+ "sector_trailer_unsafeMain.h"
+
+
+
+
+ "lib/include/uFCoder.h"
+
+
+
+
+1562059916 c:\users\projekat\desktop\need_repo\ufr-mf-examples-cpp-gui-unsafe_sector_trailer_write\lib\include\ufcoder.h
+
+
+
+1511530394 c:\wxwidgets-3.0.3\lib\gcc_lib\mswu\wx\setup.h
+
diff --git a/sector_trailer_unsafe.layout b/sector_trailer_unsafe.layout
index d907ef706b427ff9e33a5a382fbfbeaf1c6253da..b027ee3bba8d86785cfc1b5eaf02921f2704a7ee 100644
--- a/sector_trailer_unsafe.layout
+++ b/sector_trailer_unsafe.layout
@@ -2,14 +2,14 @@
-
+
-
+
-
+
diff --git a/sector_trailer_unsafeMain.cpp b/sector_trailer_unsafeMain.cpp
index deac168f8da519bdf3620c0ab5e8b95320024565..caad1ae18fd2e81c933f741e643cb21fed93c348 100644
--- a/sector_trailer_unsafeMain.cpp
+++ b/sector_trailer_unsafeMain.cpp
@@ -90,9 +90,12 @@ END_EVENT_TABLE()
sector_trailer_unsafeFrame::sector_trailer_unsafeFrame(wxWindow* parent,wxWindowID id)
{
//(*Initialize(sector_trailer_unsafeFrame)
+ wxStaticBoxSizer* StaticBoxSizer2;
wxGridSizer* GridSizer4;
wxMenuItem* MenuItem2;
+ wxFlexGridSizer* FlexGridSizer3;
wxMenuItem* MenuItem1;
+ wxFlexGridSizer* FlexGridSizer2;
wxMenu* Menu1;
wxGridSizer* GridSizer1;
wxGridSizer* GridSizer3;
@@ -104,55 +107,55 @@ sector_trailer_unsafeFrame::sector_trailer_unsafeFrame(wxWindow* parent,wxWindow
wxGridSizer* GridSizer2;
Create(parent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE, _T("wxID_ANY"));
+ SetClientSize(wxSize(820,650));
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
- GridSizer1 = new wxGridSizer(3, 1, -150, 0);
+ GridSizer1 = new wxGridSizer(3, 1, 20, 0);
StaticBoxSizer1 = new wxStaticBoxSizer(wxHORIZONTAL, this, wxEmptyString);
- GridSizer4 = new wxGridSizer(2, 3, 0, -700);
+ GridSizer4 = new wxGridSizer(2, 1, 0, -700);
+ FlexGridSizer2 = new wxFlexGridSizer(0, 3, 0, 0);
bReaderOpen = new wxButton(this, ID_BUTTON1, _("ReaderOpen()"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON1"));
- GridSizer4->Add(bReaderOpen, 0, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+ FlexGridSizer2->Add(bReaderOpen, 0, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
bReaderClose = new wxButton(this, ID_BUTTON2, _("ReaderClose()"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON2"));
- GridSizer4->Add(bReaderClose, 0, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
- OPEN_STATUS = new wxTextCtrl(this, ID_TEXTCTRL5, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY|wxTE_CENTRE, wxDefaultValidator, _T("ID_TEXTCTRL5"));
- GridSizer4->Add(OPEN_STATUS, 0, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
- FlexGridSizer1 = new wxFlexGridSizer(2, 8, 0, 0);
+ FlexGridSizer2->Add(bReaderClose, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+ OPEN_STATUS = new wxTextCtrl(this, ID_TEXTCTRL5, wxEmptyString, wxDefaultPosition, wxSize(156,21), wxTE_READONLY|wxTE_CENTRE, wxDefaultValidator, _T("ID_TEXTCTRL5"));
+ FlexGridSizer2->Add(OPEN_STATUS, 0, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+ GridSizer4->Add(FlexGridSizer2, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+ FlexGridSizer1 = new wxFlexGridSizer(3, 8, 0, 0);
chkAdvanced = new wxCheckBox(this, ID_CHECKBOX1, _("Use Advanced options"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_CHECKBOX1"));
chkAdvanced->SetValue(false);
- FlexGridSizer1->Add(chkAdvanced, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- FlexGridSizer1->Add(-1,-1,1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- FlexGridSizer1->Add(-1,-1,0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- FlexGridSizer1->Add(-1,-1,0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- FlexGridSizer1->Add(-1,-1,0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- FlexGridSizer1->Add(-1,-1,0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- FlexGridSizer1->Add(-1,-1,0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- FlexGridSizer1->Add(-1,-1,0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+ FlexGridSizer1->Add(chkAdvanced, 0, wxALL|wxEXPAND, 5);
+ StaticBoxSizer2 = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Advanced options"));
+ FlexGridSizer3 = new wxFlexGridSizer(2, 8, 0, 0);
wxRTypeLabel = new wxStaticText(this, ID_STATICTEXT7, _("Reader type:"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT7"));
wxRTypeLabel->Disable();
- FlexGridSizer1->Add(wxRTypeLabel, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
- txtReaderType = new wxTextCtrl(this, ID_TEXTCTRL8, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL8"));
+ FlexGridSizer3->Add(wxRTypeLabel, 0, wxALL|wxEXPAND, 5);
+ txtReaderType = new wxTextCtrl(this, ID_TEXTCTRL8, wxEmptyString, wxDefaultPosition, wxSize(27,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL8"));
txtReaderType->Disable();
- FlexGridSizer1->Add(txtReaderType, 0, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+ FlexGridSizer3->Add(txtReaderType, 0, wxALL|wxEXPAND, 5);
wxPNameLabel = new wxStaticText(this, ID_STATICTEXT8, _("Port name:"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT8"));
wxPNameLabel->Disable();
- FlexGridSizer1->Add(wxPNameLabel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- txtPortName = new wxTextCtrl(this, ID_TEXTCTRL9, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL9"));
+ FlexGridSizer3->Add(wxPNameLabel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+ txtPortName = new wxTextCtrl(this, ID_TEXTCTRL9, wxEmptyString, wxDefaultPosition, wxSize(84,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL9"));
txtPortName->Disable();
- FlexGridSizer1->Add(txtPortName, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+ FlexGridSizer3->Add(txtPortName, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxPInterfaceLabel = new wxStaticText(this, ID_STATICTEXT9, _("Port interface:"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT9"));
wxPInterfaceLabel->Disable();
- FlexGridSizer1->Add(wxPInterfaceLabel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- txtPortInterface = new wxTextCtrl(this, ID_TEXTCTRL10, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL10"));
+ FlexGridSizer3->Add(wxPInterfaceLabel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+ txtPortInterface = new wxTextCtrl(this, ID_TEXTCTRL10, wxEmptyString, wxDefaultPosition, wxSize(29,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL10"));
txtPortInterface->Disable();
- FlexGridSizer1->Add(txtPortInterface, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+ FlexGridSizer3->Add(txtPortInterface, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
wxArgLabel = new wxStaticText(this, ID_STATICTEXT10, _("Additional argument:"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT10"));
wxArgLabel->Disable();
- FlexGridSizer1->Add(wxArgLabel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- txtAddArg = new wxTextCtrl(this, ID_TEXTCTRL11, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_TEXTCTRL11"));
+ FlexGridSizer3->Add(wxArgLabel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+ txtAddArg = new wxTextCtrl(this, ID_TEXTCTRL11, wxEmptyString, wxDefaultPosition, wxSize(81,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL11"));
txtAddArg->Disable();
- FlexGridSizer1->Add(txtAddArg, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+ FlexGridSizer3->Add(txtAddArg, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+ StaticBoxSizer2->Add(FlexGridSizer3, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
+ FlexGridSizer1->Add(StaticBoxSizer2, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
GridSizer4->Add(FlexGridSizer1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- StaticBoxSizer1->Add(GridSizer4, 0, wxALL|wxALIGN_TOP, 5);
+ StaticBoxSizer1->Add(GridSizer4, 0, wxALL|wxEXPAND|wxSHAPED, 5);
GridSizer1->Add(StaticBoxSizer1, 1, wxALL|wxALIGN_LEFT|wxALIGN_TOP, 5);
- GridSizer2 = new wxGridSizer(8, 2, 0, -10);
+ GridSizer2 = new wxGridSizer(7, 2, 0, -10);
StaticText1 = new wxStaticText(this, ID_STATICTEXT1, _("Addressing mode : (example, for addressing mode 1, input 01 - hexadecimal) "), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT1"));
GridSizer2->Add(StaticText1, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
ADDRESSING_MODE_LABEL = new wxTextCtrl(this, ID_TEXTCTRL1, wxEmptyString, wxDefaultPosition, wxSize(45,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL1"));
@@ -163,7 +166,7 @@ sector_trailer_unsafeFrame::sector_trailer_unsafeFrame(wxWindow* parent,wxWindow
GridSizer2->Add(ADDRESS_LABEL, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
StaticText3 = new wxStaticText(this, ID_STATICTEXT3, _("Sector trailer data (16 bytes, example : FFFF - 2 bytes) : "), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT3"));
GridSizer2->Add(StaticText3, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
- TRAILER_DATA_LABEL = new wxTextCtrl(this, ID_TEXTCTRL3, wxEmptyString, wxDefaultPosition, wxSize(400,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL3"));
+ TRAILER_DATA_LABEL = new wxTextCtrl(this, ID_TEXTCTRL3, wxEmptyString, wxDefaultPosition, wxSize(380,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL3"));
GridSizer2->Add(TRAILER_DATA_LABEL, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
AUTH_A = new wxRadioButton(this, ID_RADIOBUTTON2, _("MIFARE_AUTHENT1A"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_RADIOBUTTON2"));
GridSizer2->Add(AUTH_A, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
@@ -171,12 +174,12 @@ sector_trailer_unsafeFrame::sector_trailer_unsafeFrame(wxWindow* parent,wxWindow
GridSizer2->Add(AUTH_B, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
StaticText4 = new wxStaticText(this, ID_STATICTEXT4, _("Key (6 bytes) : "), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT4"));
GridSizer2->Add(StaticText4, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
- KEY_LABEL = new wxTextCtrl(this, ID_TEXTCTRL4, wxEmptyString, wxDefaultPosition, wxSize(200,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL4"));
- GridSizer2->Add(KEY_LABEL, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+ KEY_LABEL = new wxTextCtrl(this, ID_TEXTCTRL4, wxEmptyString, wxDefaultPosition, wxSize(200,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL4"));
+ GridSizer2->Add(KEY_LABEL, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
StaticText6 = new wxStaticText(this, ID_STATICTEXT6, _("Sector data : "), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT6"));
GridSizer2->Add(StaticText6, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
- SECTOR_DATA = new wxTextCtrl(this, ID_TEXTCTRL7, wxEmptyString, wxDefaultPosition, wxSize(400,-1), 0, wxDefaultValidator, _T("ID_TEXTCTRL7"));
- GridSizer2->Add(SECTOR_DATA, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+ SECTOR_DATA = new wxTextCtrl(this, ID_TEXTCTRL7, wxEmptyString, wxDefaultPosition, wxSize(380,21), 0, wxDefaultValidator, _T("ID_TEXTCTRL7"));
+ GridSizer2->Add(SECTOR_DATA, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
BoxSizer1 = new wxBoxSizer(wxHORIZONTAL);
bWrite = new wxButton(this, ID_BUTTON3, _("WRITE"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON3"));
BoxSizer1->Add(bWrite, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
@@ -184,12 +187,12 @@ sector_trailer_unsafeFrame::sector_trailer_unsafeFrame(wxWindow* parent,wxWindow
BoxSizer1->Add(bClear, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5);
GridSizer2->Add(BoxSizer1, 1, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxSHAPED, 5);
GridSizer1->Add(GridSizer2, 0, wxALL|wxALIGN_LEFT|wxALIGN_TOP, 5);
- GridSizer3 = new wxGridSizer(1, 2, 0, -200);
+ GridSizer3 = new wxGridSizer(1, 2, 0, -150);
StaticText5 = new wxStaticText(this, ID_STATICTEXT5, _("FUNCTION STATUS : "), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT5"));
GridSizer3->Add(StaticText5, 1, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
FUNCTION_STATUS = new wxTextCtrl(this, ID_TEXTCTRL6, wxEmptyString, wxDefaultPosition, wxSize(300,-1), wxTE_READONLY|wxTE_CENTRE, wxDefaultValidator, _T("ID_TEXTCTRL6"));
GridSizer3->Add(FUNCTION_STATUS, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
- GridSizer1->Add(GridSizer3, 0, wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5);
+ GridSizer1->Add(GridSizer3, 0, wxALL|wxALIGN_LEFT|wxALIGN_BOTTOM, 5);
SetSizer(GridSizer1);
MenuBar1 = new wxMenuBar();
Menu1 = new wxMenu();
@@ -207,8 +210,8 @@ sector_trailer_unsafeFrame::sector_trailer_unsafeFrame(wxWindow* parent,wxWindow
StatusBar1->SetFieldsCount(1,__wxStatusBarWidths_1);
StatusBar1->SetStatusStyles(1,__wxStatusBarStyles_1);
SetStatusBar(StatusBar1);
- GridSizer1->Fit(this);
- GridSizer1->SetSizeHints(this);
+ SetSizer(GridSizer1);
+ Layout();
Connect(ID_BUTTON1,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)§or_trailer_unsafeFrame::OnbReaderOpenClick);
Connect(ID_BUTTON2,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)§or_trailer_unsafeFrame::OnbReaderCloseClick);
diff --git a/wxsmith/sector_trailer_unsafeframe.wxs b/wxsmith/sector_trailer_unsafeframe.wxs
index 291399d8d90ce981927ad80e32d39facbad22dee..0c2c31f92f5a2513c258075cd29b82428b3fa34d 100644
--- a/wxsmith/sector_trailer_unsafeframe.wxs
+++ b/wxsmith/sector_trailer_unsafeframe.wxs
@@ -1,149 +1,151 @@