Windows version fixed up

Removed FTP upload.
peterkvt80 · Nov 13, 2021 · 930bf94 · 930bf94
1 parent 501a6a6
commit 930bf94
Show file tree

Hide file tree

Showing 11 changed files with 7,081 additions and 3,880 deletions.
diff --git 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
@@ -2,12 +2,12 @@
 #define PAGESETTINGSDIALOG_H
 
 //(*Headers(PageSettingsDialog)
-#include <wx/stattext.h>
-#include <wx/radiobox.h>
-#include <wx/textctrl.h>
-#include <wx/checkbox.h>
 #include <wx/button.h>
+#include <wx/checkbox.h>
 #include <wx/dialog.h>
+#include <wx/radiobox.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
 //*)
 
 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
diff --git 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
@@ -3,15 +3,16 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="wxTED" />
-		<Option platforms="Unix;" />
+		<Option platforms="Windows;Unix;" />
 		<Option pch_mode="2" />
-		<Option compiler="gcc" />
+		<Option compiler="original_gnu_gcc_compiler" />
 		<Build>
 			<Target title="Debug">
+				<Option platforms="Windows;" />
 				<Option output="bin/Debug/wxTED" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="1" />
-				<Option compiler="gcc" />
+				<Option compiler="original_gnu_gcc_compiler" />
 				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
 					<Add option="-Wshadow" />
@@ -24,29 +25,49 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
+				<Option platforms="Windows;" />
 				<Option output="bin/Release/wxTED" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="0" />
-				<Option compiler="gcc" />
+				<Option compiler="original_gnu_gcc_compiler" />
 				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-Wzero-as-null-pointer-constant" />
 					<Add option="-Wall" />
+					<Add option="-std=gnu++11" />
+					<Add option="-std=c++11" />
+					<Add option="-m64" />
+					<Add option="-D__WXMSW__" />
 					<Add directory="include" />
+					<Add directory="E:/dev/wxwidgets/wxWidgets-3.0.5" />
+					<Add directory="E:/dev/wxwidgets/wxWidgets-3.0.5/include" />
 				</Compiler>
+				<ResourceCompiler>
+					<Add directory="E:/dev/wxwidgets/wxWidgets-3.0.5" />
+					<Add directory="E:/dev/wxTED-GitHub/wxted/" />
+				</ResourceCompiler>
 				<Linker>
 					<Add option="-s" />
+					<Add option="-m64" />
+					<Add library="E:/dev/wxwidgets/wxWidgets-3.0.5/lib/gcc_dll/libwxmsw30u.a" />
 				</Linker>
 			</Target>
 		</Build>
 		<Compiler>
 			<Add option="-Wall" />
+			<Add option="-m64" />
 			<Add option="-pipe" />
 			<Add option="`wx-config --cflags`" />
 			<Add option="-DwxUSE_UNICODE" />
+			<Add directory="E:/dev/wxwidgets/wxWidgets-3.0.5/lib/gcc_dll/mswu" />
+			<Add directory="E:/dev/wxwidgets/wxWidgets-3.0.5/include/" />
 		</Compiler>
+		<ResourceCompiler>
+			<Add directory="E:/dev/wxwidgets/wxWidgets-3.0.5/include" />
+		</ResourceCompiler>
 		<Linker>
+			<Add option="-m64" />
 			<Add option="`wx-config --libs`" />
 		</Linker>
 		<Unit filename="HelpFrame.cpp" />
@@ -62,12 +83,14 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="hamm.h" />
+		<Unit filename="include/HeaderPacket.h" />
 		<Unit filename="include/T42.h" />
 		<Unit filename="mapchar.cpp" />
 		<Unit filename="mapchar.h" />
 		<Unit filename="resource.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
+		<Unit filename="src/HeaderPacket.cpp" />
 		<Unit filename="src/T42.cpp" />
 		<Unit filename="teddybear.ico" />
 		<Unit filename="tedevent.cpp" />