diff --git a/PageSettingsDialog.cpp b/PageSettingsDialog.cpp index c090808..92914a7 100644 --- a/PageSettingsDialog.cpp +++ b/PageSettingsDialog.cpp @@ -22,10 +22,10 @@ const long PageSettingsDialog::ID_CHECKBOXC8UPDATE = wxNewId(); const long PageSettingsDialog::ID_CHECKBOXC7SuppressHeader = wxNewId(); const long PageSettingsDialog::ID_CHECKBOXC6Subtitle = wxNewId(); const long PageSettingsDialog::ID_TEXTCTRLFASTEXTLINK1 = wxNewId(); -const long PageSettingsDialog::ID_TEXTCTRLFASTEXTLINK2 = wxNewId(); -const long PageSettingsDialog::ID_TEXTCTRLFASTEXTLINK3 = wxNewId(); -const long PageSettingsDialog::ID_TEXTCTRLFASTEXTLINK4 = wxNewId(); const long PageSettingsDialog::ID_TEXTCTRLFASTEXTINDEX = wxNewId(); +const long PageSettingsDialog::ID_TEXTCTRLFASTEXTLINK4 = wxNewId(); +const long PageSettingsDialog::ID_TEXTCTRLFASTEXTLINK3 = wxNewId(); +const long PageSettingsDialog::ID_TEXTCTRLFASTEXTLINK2 = wxNewId(); //*) BEGIN_EVENT_TABLE(PageSettingsDialog,wxDialog) @@ -60,23 +60,23 @@ PageSettingsDialog::PageSettingsDialog(wxWindow* parent,wxWindowID id,const wxPo CheckBoxC4ErasePage->SetValue(false); CheckBoxC5Newsflash = new wxCheckBox(this, ID_CHECKBOXC5Newsflash, _("C5 Newsflash"), wxPoint(192,112), wxSize(150,13), 0, wxDefaultValidator, _T("ID_CHECKBOXC5Newsflash")); CheckBoxC5Newsflash->SetValue(false); - CheckBoxC6Subtitle = new wxCheckBox(this, ID_CHECKBOXC6Subtitle, _("C6 Subtitle"), wxPoint(192,136), wxSize(150,13), 0, wxDefaultValidator, _T("ID_CHECKBOXC6Subtitle")); - CheckBoxC6Subtitle->SetValue(false); - CheckBoxC7SuppressHeader = new wxCheckBox(this, ID_CHECKBOXC7SuppressHeader, _("C7 Suppress Header"), wxPoint(192,160), wxSize(150,13), 0, wxDefaultValidator, _T("ID_CHECKBOXC7SuppressHeader")); - CheckBoxC7SuppressHeader->SetValue(false); - CheckBoxC8Update = new wxCheckBox(this, ID_CHECKBOXC8UPDATE, _("C8 Update"), wxPoint(192,184), wxSize(150,13), 0, wxDefaultValidator, _T("ID_CHECKBOXC8UPDATE")); - CheckBoxC8Update->SetValue(false); CheckBoxTransmitPage = new wxCheckBox(this, ID_CHECKBOXTransmitPage, _("Transmit Page"), wxPoint(192,208), wxSize(104,13), 0, wxDefaultValidator, _T("ID_CHECKBOXTransmitPage")); CheckBoxTransmitPage->SetValue(false); + CheckBoxC8Update = new wxCheckBox(this, ID_CHECKBOXC8UPDATE, _("C8 Update"), wxPoint(192,184), wxSize(150,13), 0, wxDefaultValidator, _T("ID_CHECKBOXC8UPDATE")); + CheckBoxC8Update->SetValue(false); + CheckBoxC7SuppressHeader = new wxCheckBox(this, ID_CHECKBOXC7SuppressHeader, _("C7 Suppress Header"), wxPoint(192,160), wxSize(150,13), 0, wxDefaultValidator, _T("ID_CHECKBOXC7SuppressHeader")); + CheckBoxC7SuppressHeader->SetValue(false); + CheckBoxC6Subtitle = new wxCheckBox(this, ID_CHECKBOXC6Subtitle, _("C6 Subtitle"), wxPoint(192,136), wxSize(150,13), 0, wxDefaultValidator, _T("ID_CHECKBOXC6Subtitle")); + CheckBoxC6Subtitle->SetValue(false); TextCtrlFastext1 = new wxTextCtrl(this, ID_TEXTCTRLFASTEXTLINK1, _("100"), wxPoint(8,208), wxSize(32,21), 0, wxDefaultValidator, _T("ID_TEXTCTRLFASTEXTLINK1")); TextCtrlFastext1->SetBackgroundColour(wxColour(255,174,174)); - TextCtrlFastext2 = new wxTextCtrl(this, ID_TEXTCTRLFASTEXTLINK2, _("100"), wxPoint(48,208), wxSize(32,21), 0, wxDefaultValidator, _T("ID_TEXTCTRLFASTEXTLINK2")); - TextCtrlFastext2->SetBackgroundColour(wxColour(184,249,181)); - TextCtrlFastext3 = new wxTextCtrl(this, ID_TEXTCTRLFASTEXTLINK3, _("100"), wxPoint(88,208), wxSize(32,21), 0, wxDefaultValidator, _T("ID_TEXTCTRLFASTEXTLINK3")); - TextCtrlFastext3->SetBackgroundColour(wxColour(249,253,176)); + TextCtrlFastextIndex = new wxTextCtrl(this, ID_TEXTCTRLFASTEXTINDEX, _("100"), wxPoint(48,240), wxSize(32,21), 0, wxDefaultValidator, _T("ID_TEXTCTRLFASTEXTINDEX")); TextCtrlFastext4 = new wxTextCtrl(this, ID_TEXTCTRLFASTEXTLINK4, _("100"), wxPoint(128,208), wxSize(32,21), 0, wxDefaultValidator, _T("ID_TEXTCTRLFASTEXTLINK4")); TextCtrlFastext4->SetBackgroundColour(wxColour(177,249,252)); - TextCtrlFastextIndex = new wxTextCtrl(this, ID_TEXTCTRLFASTEXTINDEX, _("100"), wxPoint(48,240), wxSize(32,21), 0, wxDefaultValidator, _T("ID_TEXTCTRLFASTEXTINDEX")); + TextCtrlFastext3 = new wxTextCtrl(this, ID_TEXTCTRLFASTEXTLINK3, _("100"), wxPoint(88,208), wxSize(32,21), 0, wxDefaultValidator, _T("ID_TEXTCTRLFASTEXTLINK3")); + TextCtrlFastext3->SetBackgroundColour(wxColour(249,253,176)); + TextCtrlFastext2 = new wxTextCtrl(this, ID_TEXTCTRLFASTEXTLINK2, _("100"), wxPoint(48,208), wxSize(32,21), 0, wxDefaultValidator, _T("ID_TEXTCTRLFASTEXTLINK2")); + TextCtrlFastext2->SetBackgroundColour(wxColour(184,249,181)); Connect(wxID_OK,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&PageSettingsDialog::OnButtonOKClick); Connect(wxID_CANCEL,wxEVT_COMMAND_BUTTON_CLICKED,(wxObjectEventFunction)&PageSettingsDialog::OnButtonCancelClick); diff --git a/PageSettingsDialog.h b/PageSettingsDialog.h index 3b284a2..5801c19 100644 --- a/PageSettingsDialog.h +++ b/PageSettingsDialog.h @@ -2,12 +2,12 @@ #define PAGESETTINGSDIALOG_H //(*Headers(PageSettingsDialog) -#include -#include -#include -#include #include +#include #include +#include +#include +#include //*) class PageSettingsDialog: public wxDialog @@ -21,28 +21,28 @@ class PageSettingsDialog: public wxDialog virtual ~PageSettingsDialog(); //(*Declarations(PageSettingsDialog) - wxStaticText* StaticTextLabel1; - wxTextCtrl* TextCtrlFastext2; + wxButton* ButtonCancel; + wxButton* ButtonOK; + wxCheckBox* CheckBoxC4ErasePage; wxCheckBox* CheckBoxC5Newsflash; - wxTextCtrl* TextCtrlFastext3; - wxTextCtrl* TextCtrlFastextIndex; - wxRadioBox* RadioBoxCycleMode; - wxStaticText* StaticText2; + wxCheckBox* CheckBoxC6Subtitle; wxCheckBox* CheckBoxC7SuppressHeader; - wxButton* ButtonOK; - wxTextCtrl* TextCtrlFastext1; + wxCheckBox* CheckBoxC8Update; + wxCheckBox* CheckBoxTransmitPage; + wxRadioBox* RadioBoxCycleMode; wxStaticText* StaticText1; + wxStaticText* StaticText2; wxStaticText* StaticText3; - wxTextCtrl* TextCtrlDescription; - wxButton* ButtonCancel; - wxTextCtrl* TextCtrlPageNumber; - wxCheckBox* CheckBoxC8Update; - wxCheckBox* CheckBoxC4ErasePage; - wxCheckBox* CheckBoxC6Subtitle; wxStaticText* StaticText4; - wxTextCtrl* TextCtrlFastext4; - wxCheckBox* CheckBoxTransmitPage; + wxStaticText* StaticTextLabel1; wxTextCtrl* TextCtrlCycleTime; + wxTextCtrl* TextCtrlDescription; + wxTextCtrl* TextCtrlFastext1; + wxTextCtrl* TextCtrlFastext2; + wxTextCtrl* TextCtrlFastext3; + wxTextCtrl* TextCtrlFastext4; + wxTextCtrl* TextCtrlFastextIndex; + wxTextCtrl* TextCtrlPageNumber; //*) protected: diff --git a/bin/Release/wxmsw30u_gcc_custom.dll b/bin/Release/wxmsw30u_gcc_custom.dll index 720266e..dc5ebd0 100644 Binary files a/bin/Release/wxmsw30u_gcc_custom.dll and b/bin/Release/wxmsw30u_gcc_custom.dll differ diff --git a/include/HeaderPacket.h b/include/HeaderPacket.h index 8c2c9e1..4c2fc02 100644 --- a/include/HeaderPacket.h +++ b/include/HeaderPacket.h @@ -23,9 +23,9 @@ class HeaderPacket : public T42 private: uint8_t mag{1}; uint16_t flags{0}; - char heading[25] = {"WXTED WXTED WXTED WXTED "}; + char heading[25]; uint8_t page_number{0}; - char time[9] = {"00:00/00"}; + char time[9]; // = {"00:00/00"}; }; #endif // HEADERPACKET_H diff --git a/wxTED.cbp b/wxTED.cbp index 74d9aa5..f01857f 100644 --- a/wxTED.cbp +++ b/wxTED.cbp @@ -3,15 +3,16 @@