Builds and runs from ldmicro.cpp. No further testing is required.

1 files changed, 560 insertions, 537 deletions

diff --git a/ldmicro/maincontrols.cpp b/ldmicro/maincontrols.cpp
index da454a9..3e92e52 100644
--- a/ldmicro/maincontrols.cpp
+++ b/ldmicro/maincontrols.cpp
@@ -23,11 +23,15 @@
 // Jonathan Westhues, Nov 2004
 //-----------------------------------------------------------------------------
 #include "linuxUI.h"
+#include <typeinfo>
 //#include <commctrl.h>
 //#include <commdlg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "ldmicro.h"
+#include <iostream>
+
+using namespace std;
 
 // Menu IDs
 HMENU MNU_NEW;
@@ -87,7 +91,8 @@ HMENU MNU_MAKE_RESET_ONLY;
 HMENU MNU_INSERT_PWL;
 
 HMENU MNU_MCU_SETTINGS;
-HMENU MNU_PROCESSOR_0;
+HMENU MNU_PROCESSOR[NUM_SUPPORTED_MCUS+1];
+HMENU MNU_MICRO_CONTROLLER;                                         // Item for Microcontroller
 
 HMENU MNU_SIMULATION_MODE;
 HMENU MNU_START_SIMULATION;
@@ -103,20 +108,23 @@ HMENU MNU_ABOUT;
 // scrollbars for the ladder logic area
 // static HWND         HorizScrollBar;
 // static HWND         VertScrollBar;
-int                 ScrollWidth;
-int                 ScrollHeight;
-BOOL                NeedHoriz;
+// int                 ScrollWidth;
+// int                 ScrollHeight;
+// BOOL                NeedHoriz;
 
 // status bar at the bottom of the screen, to display settings
-// static HWND         StatusBar;
+static HMENU        StatusBar;
 
 // have to get back to the menus to gray/ungray, check/uncheck things
-// static HMENU        FileMenu;
-// static HMENU        EditMenu;
-// static HMENU        InstructionMenu;
-// static HMENU        ProcessorMenu;
-// static HMENU        SimulateMenu;
-// static HMENU        TopMenu;
+static HMENU        FileMenu;
+static HMENU        EditMenu;
+static HMENU        InstructionMenu;
+static HMENU        ProcessorMenu;
+static HMENU        SimulateMenu;
+static HMENU        TopMenu;                                            // Menu Bar
+static HMENU        settings;
+static HMENU        compile;
+static HMENU        help;
 
 // listview used to maintain the list of I/O pins with symbolic names, plus
 // the internal relay too
@@ -125,216 +133,21 @@ static int          IoListSelectionPoint;
 static BOOL         IoListOutOfSync;
 int                 IoListHeight;
 int                 IoListTop;
+GtkTreeIter* iter = new GtkTreeIter;
+GtkTreeModel **IoListPtr = (GtkTreeModel**)GTK_TREE_MODEL (IoList);
 
 // whether the simulation is running in real time
 static BOOL         RealTimeSimulationRunning;
 
 //-----------------------------------------------------------------------------
-// Create the standard Windows controls used in the main window: a Listview
-// for the I/O list, and a status bar for settings.
-//-----------------------------------------------------------------------------
-void MakeMainWindowControls(void)
-{
-    // GtkWidget* PackBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-    // GtkWidget* grid = gtk_grid_new();
-    // GtkWidget* pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-    // GtkListStore* IoList = gtk_list_store_new (5, 
-    //                                 G_TYPE_STRING,   
-    //                                 G_TYPE_STRING,    
-    //                                 G_TYPE_STRING,
-    //                                 G_TYPE_STRING,
-    //                                 G_TYPE_STRING); 
-    // GtkWidget* view;
-    // GtkTreeViewColumn* column;
-
-    // int typeWidth = 85;
-    // int pinWidth = 100;
-    // int portWidth = 90;
-
-    // // Creating a list
-    // view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(IoList));
-    // gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (IoList));
-
-    // column = gtk_tree_view_column_new_with_attributes("Name",
-    //                                                 gtk_cell_renderer_text_new(),
-    //                                                 "text", LV_IO_NAME,
-    //                                                 NULL);
-    // gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
-    // gtk_tree_view_column_set_min_width (column, 250);
-
-    // column = gtk_tree_view_column_new_with_attributes("Type",
-    //                                                 gtk_cell_renderer_spin_new(),
-    //                                                 "text", LV_IO_TYPE,
-    //                                                 NULL);
-    // gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
-    // gtk_tree_view_column_set_min_width (column, typeWidth);
-
-    // column = gtk_tree_view_column_new_with_attributes("State",
-    //                                                 gtk_cell_renderer_text_new(),
-    //                                                 "text", LV_IO_STATE,
-    //                                                 NULL);
-    // gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
-    // gtk_tree_view_column_set_min_width (column, 100);
-
-    // column = gtk_tree_view_column_new_with_attributes("Pin on Processor",
-    //                                                 gtk_cell_renderer_text_new(),
-    //                                                 "text", LV_IO_PIN,
-    //                                                 NULL);
-    // gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
-    // gtk_tree_view_column_set_min_width (column, pinWidth);
-
-    // column = gtk_tree_view_column_new_with_attributes("MCU Port",
-    //                                                 gtk_cell_renderer_text_new(),
-    //                                                 "text", LV_IO_PORT,
-    //                                                 NULL);
-    // gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
-    // gtk_tree_view_column_set_min_width (column, portWidth);
-
-    // // Appending Menus to grid
-    // gtk_grid_attach (GTK_GRID (grid), MakeMainWindowMenus(), 0, 0, 1, 1);
-
-    // // Creating Scrolled Window
-    // GtkWidget* ScrollWindow = gtk_scrolled_window_new (NULL, NULL);
-    // gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ScrollWindow),
-	// 			                          GTK_POLICY_AUTOMATIC, 
-	// 			                          GTK_POLICY_ALWAYS);
-
-    // // Creating a pane to separate Scrolled Window and other widgets
-    // gtk_paned_add1 (GTK_PANED (pane), ScrollWindow);
-    // gtk_paned_set_position (GTK_PANED (pane), 0);
-    // gtk_widget_set_vexpand (ScrollWindow, TRUE);
-    // gtk_widget_set_hexpand (ScrollWindow, TRUE);
-
-    // // Appending tree view to pane and pane to grid
-    // gtk_paned_add2 (GTK_PANED(pane), view);
-    // gtk_paned_set_position (GTK_PANED (pane), 250);
-    // gtk_grid_attach (GTK_GRID (grid), pane, 0, 0, 1, 1); 
-
-    // // Creating Status Bar and attaching to grid
-    // StatusBar = gtk_statusbar_new();
-    // gtk_statusbar_push (GTK_STATUSBAR (StatusBar),
-    //                     gtk_statusbar_get_context_id (GTK_STATUSBAR (StatusBar), "Introduction"), 
-    //                     "LDMicro Started");
-
-    // // Appneding Status Bar to box which is then added to Main Window
-    // gtk_box_pack_start(GTK_BOX(PackBox), grid, TRUE, TRUE, 0);
-    // gtk_box_pack_start(GTK_BOX(PackBox), StatusBar, FALSE, FALSE, 0);
-    // gtk_container_add(GTK_CONTAINER(MainWindow), PackBox);
-}
-
-//-----------------------------------------------------------------------------
-// Set up the title bar text for the main window; indicate whether we are in
-// simulation or editing mode, and indicate the filename.
-//-----------------------------------------------------------------------------
-void UpdateMainWindowTitleBar(void)
-{
-//     char line[PATH_MAX+100];
-//     if(InSimulationMode) {
-//         if(RealTimeSimulationRunning) {
-//             strcpy(line, "LDmicro - Simulation (Running)");
-//         } else {
-//             strcpy(line, "LDmicro - Simulation (Stopped)");
-//         }
-//     } else {
-//         strcpy(line, "LDmicro - Program Editor");
-//     }
-//     if(strlen(CurrentSaveFile) > 0) {
-//         sprintf(line+strlen(line), " - %s", CurrentSaveFile);
-//     } else {
-//         strcat(line, " - (not yet saved)");
-//     }
-    
-//   gtk_window_set_title (GTK_WINDOW (window), line);
-}
-
-//-----------------------------------------------------------------------------
-// Set the enabled state of the logic menu items to reflect where we are on
-// the schematic (e.g. can't insert two coils in series).
-//-----------------------------------------------------------------------------
-void SetMenusEnabled(BOOL canNegate, BOOL canNormal, BOOL canResetOnly,
-    BOOL canSetOnly, BOOL canDelete, BOOL canInsertEnd, BOOL canInsertOther,
-    BOOL canPushDown, BOOL canPushUp, BOOL canInsertComment)
-{
-    // EnableMenuItem(EditMenu, MNU_PUSH_RUNG_UP,
-    //     canPushUp ? MF_ENABLED : MF_GRAYED);
-    // EnableMenuItem(EditMenu, MNU_PUSH_RUNG_DOWN,
-    //     canPushDown ? MF_ENABLED : MF_GRAYED);
-    // EnableMenuItem(EditMenu, MNU_DELETE_RUNG,
-    //     (Prog.numRungs > 1) ? MF_ENABLED : MF_GRAYED);
-
-    // EnableMenuItem(InstructionMenu, MNU_NEGATE,
-    //     canNegate ? MF_ENABLED : MF_GRAYED);
-    // EnableMenuItem(InstructionMenu, MNU_MAKE_NORMAL,
-    //     canNormal ? MF_ENABLED : MF_GRAYED);
-    // EnableMenuItem(InstructionMenu, MNU_MAKE_RESET_ONLY,
-    //     canResetOnly ? MF_ENABLED : MF_GRAYED);
-    // EnableMenuItem(InstructionMenu, MNU_MAKE_SET_ONLY,
-    //     canSetOnly ? MF_ENABLED : MF_GRAYED);
-
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_COMMENT,
-    //     canInsertComment ? MF_ENABLED : MF_GRAYED);
-
-    // EnableMenuItem(EditMenu, MNU_DELETE_ELEMENT,
-    //     canDelete ? MF_ENABLED : MF_GRAYED);
-
-    // int t;
-    // t = canInsertEnd ? MF_ENABLED : MF_GRAYED;
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_COIL, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_RES, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_MOV, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_ADD, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_SUB, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_MUL, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_DIV, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_CTC, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_PERSIST, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_READ_ADC, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_SET_PWM, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_MASTER_RLY, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_SHIFT_REG, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_LUT, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_PWL, t);
-
-    // t = canInsertOther ? MF_ENABLED : MF_GRAYED;
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_TON, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_TOF, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_OSR, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_OSF, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_RTO, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_CONTACTS, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_CTU, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_CTD, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_EQU, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_NEQ, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_GRT, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_GEQ, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_LES, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_LEQ, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_SHORT, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_OPEN, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_UART_SEND, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_UART_RECV, t);
-    // EnableMenuItem(InstructionMenu, MNU_INSERT_FMTD_STR, t);
-}
-
-//-----------------------------------------------------------------------------
-// Set the enabled state of the undo/redo menus.
-//-----------------------------------------------------------------------------
-void SetUndoEnabled(BOOL undoEnabled, BOOL redoEnabled)
-{
-    // EnableMenuItem(EditMenu, MNU_UNDO, undoEnabled ? MF_ENABLED : MF_GRAYED);
-    // EnableMenuItem(EditMenu, MNU_REDO, redoEnabled ? MF_ENABLED : MF_GRAYED);
-}
-
-//-----------------------------------------------------------------------------
 // Create the top-level menu bar for the main window. Mostly static, but we
 // create the "select processor" menu from the list in mcutable.h dynamically.
 //-----------------------------------------------------------------------------
 HMENU MakeMainWindowMenus(void)
 {   
-    HMENU  MenuBox;                                                 // Box for alignment
-    HMENU  PackedMenuBox;                                           // Stores the packed box
-    HMENU  TopMenu;                                                 // Menu Bar
+    HMENU MenuBox;                                                  // Box for alignment
+    HMENU PackedMenuBox;                                            // Stores the packed box
+    HMENU TopMenu;                                                  // Menu Bar
     HWID  FileLabel;                                                // File menu label
     HWID  EditLabel;                                                // Edit menu label
     HWID  InstructionLabel;                                         // Instruction menu label
@@ -382,283 +195,412 @@ HMENU MakeMainWindowMenus(void)
     MNU_EXPORT = gtk_menu_item_new_with_label("Export As Text");
     MNU_EXIT = gtk_menu_item_new_with_label("Exit");
   
-    // // Appending menu items (labels) to File menu and adding separators
-    // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_NEW);       // Appending menu items
-    // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_OPEN);
-    // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_SAVE);
-    // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_SAVE_AS);
-    // FileMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), FileMenuSeparator);
-    // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_EXPORT);
-    // FileMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), FileMenuSeparator);
-    // gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_EXIT);
-
-    // // Creating labels for Edit Menu
-    // MNU_UNDO = gtk_menu_item_new_with_label("Undo");
-    // MNU_REDO = gtk_menu_item_new_with_label("Redo");
-    // MNU_INSERT_RUNG_BEFORE = gtk_menu_item_new_with_label("Insert rung Before");
-    // MNU_INSERT_RUNG_AFTER = gtk_menu_item_new_with_label("Insert Rung After");
-    // MNU_PUSH_RUNG_UP = gtk_menu_item_new_with_label("Move Selected Rung Up");
-    // MNU_PUSH_RUNG_DOWN = gtk_menu_item_new_with_label("Move Selected Rung Down");
-    // MNU_DELETE_ELEMENT = gtk_menu_item_new_with_label("Delete Selected Element");
-    // MNU_DELETE_RUNG = gtk_menu_item_new_with_label("Delete Rung");
-
-    // // Appending menu items to Edit menu and adding separators
-    // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_UNDO);    
-    // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_REDO);
-    // EditMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append(GTK_MENU_SHELL(EditMenu), EditMenuSeparator);    
-    // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_INSERT_RUNG_BEFORE);    
-    // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_INSERT_RUNG_AFTER);    
-    // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_PUSH_RUNG_UP);    
-    // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_PUSH_RUNG_DOWN);
-    // EditMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append(GTK_MENU_SHELL(EditMenu), EditMenuSeparator);    
-    // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_DELETE_ELEMENT);    
-    // gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_DELETE_RUNG);
-
-    // // Creating labels for Settings Menu
-    // MNU_MCU_SETTINGS = gtk_menu_item_new_with_label ("MCU Parameters...");
-    // MNU_PROCESSOR_0 = gtk_menu_item_new_with_label ("Microcontroller");
-
-    // // Appending menu items to Settings menu
-    // gtk_menu_shell_append (GTK_MENU_SHELL (settings), MNU_MCU_SETTINGS);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (settings), MNU_PROCESSOR_0);
-
-    // for (i = 0; i < NUM_SUPPORTED_MCUS; i++){
-    // ProcessorMenuItems = gtk_check_menu_item_new_with_label (SupportedMcus[i].mcuName);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (ProcessorMenu), ProcessorMenuItems);
-    // }
-
-    // ProcessorMenuItems = gtk_check_menu_item_new_with_label ("(no microcontroller)");
-    // gtk_menu_shell_append (GTK_MENU_SHELL (ProcessorMenu), ProcessorMenuItems);
-    // gtk_menu_item_set_submenu(GTK_MENU_ITEM(MNU_PROCESSOR_0), ProcessorMenu);
-
-    // // Creating labels for Instruction Menu and adding separators
-    // MNU_INSERT_COMMENT = gtk_menu_item_new_with_label("Insert Comment");
-    // MNU_INSERT_CONTACTS = gtk_menu_item_new_with_label("Insert Contacts");
-    // MNU_INSERT_OSR = gtk_menu_item_new_with_label("Insert OSR (One Shot Rising)");
-    // MNU_INSERT_OSF = gtk_menu_item_new_with_label("Insert OSF (One Shot Falling)");
-    // MNU_INSERT_TON = gtk_menu_item_new_with_label("Insert TON (Delayed Turn On)");
-    // MNU_INSERT_TOF = gtk_menu_item_new_with_label("Insert TOF (Delayed Turn Off)");
-    // MNU_INSERT_RTO = gtk_menu_item_new_with_label("Insert RTO (Retentive Delayed Turn On)");
-    // MNU_INSERT_CTU = gtk_menu_item_new_with_label("Insert CTU (Count Up)");
-    // MNU_INSERT_CTD = gtk_menu_item_new_with_label("Insert CTD (Count Down)");
-    // MNU_INSERT_CTC = gtk_menu_item_new_with_label("Insert CTC (Count Circular)");
-    // MNU_INSERT_EQU = gtk_menu_item_new_with_label("Insert EQU (Compare for Equals)");
-    // MNU_INSERT_NEQ = gtk_menu_item_new_with_label("Insert NEQ (Compare for Not Equals)");
-    // MNU_INSERT_GRT = gtk_menu_item_new_with_label("Insert GRT (Compare for Greater Than)");
-    // MNU_INSERT_GEQ = gtk_menu_item_new_with_label("Insert GEQ (Compare for Greater Than or Equal)");
-    // MNU_INSERT_LES = gtk_menu_item_new_with_label("Insert LES (Compare for Less Than)");
-    // MNU_INSERT_LEQ = gtk_menu_item_new_with_label("Insert LEQ (Compare for Less Than or Equal)");
-    // MNU_INSERT_OPEN = gtk_menu_item_new_with_label("Insert Open Circuit");
-    // MNU_INSERT_SHORT = gtk_menu_item_new_with_label("Insert Short Circuit");
-    // MNU_INSERT_MASTER_RLY = gtk_menu_item_new_with_label("Insert Master Control Relay");
-    // MNU_INSERT_COIL = gtk_menu_item_new_with_label("Insert Coil");
-    // MNU_INSERT_RES = gtk_menu_item_new_with_label("Insert RES (Counter/RTO Reset)");
-    // MNU_INSERT_MOV = gtk_menu_item_new_with_label("Insert MOV (Move)");
-    // MNU_INSERT_ADD = gtk_menu_item_new_with_label("Insert ADD (16-bit Integer Ad)");
-    // MNU_INSERT_SUB = gtk_menu_item_new_with_label("Insert SUB (16-bit Integer Subtract)");
-    // MNU_INSERT_MUL = gtk_menu_item_new_with_label("Insert MUL (16-bit Integer Multiply)");
-    // MNU_INSERT_DIV = gtk_menu_item_new_with_label("Insert DIV (16-bit Integer Division)");
-    // MNU_INSERT_SHIFT_REG = gtk_menu_item_new_with_label("Insert Shift Register");
-    // MNU_INSERT_LUT = gtk_menu_item_new_with_label("Insert Look-Up Table");
-    // MNU_INSERT_PWL = gtk_menu_item_new_with_label("Insert Piecewise Linear");
-    // MNU_INSERT_FMTD_STR = gtk_menu_item_new_with_label("Insert Formatted String Over UART");
-    // MNU_INSERT_UART_SEND = gtk_menu_item_new_with_label("Insert UART Send");
-    // MNU_INSERT_UART_RECV = gtk_menu_item_new_with_label("Insert UART Receive");
-    // MNU_INSERT_SET_PWM = gtk_menu_item_new_with_label("Insert Set PWM Output");
-    // MNU_INSERT_READ_ADC = gtk_menu_item_new_with_label("Insert A/D Converter Read");
-    // MNU_INSERT_PERSIST = gtk_menu_item_new_with_label("Insert Make Persistent");
-    // MNU_MAKE_NORMAL = gtk_menu_item_new_with_label("Make Normal");
-    // MNU_NEGATE = gtk_menu_item_new_with_label("Make Negated");
-    // MNU_MAKE_SET_ONLY = gtk_menu_item_new_with_label("Make Set-Only");
-    // MNU_MAKE_RESET_ONLY = gtk_menu_item_new_with_label("Make Reset-Only");
-
-    // // Appending menu items to Instruction menu and adding separators
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_COMMENT);
-    // InstructionMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CONTACTS);
-    // InstructionMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OSR);
-    // InstructionMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OSF);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_TON);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_TOF);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_RTO);
-    // InstructionMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTU);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTD);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTC);
-    // InstructionMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_EQU);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_NEQ);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_GRT);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_GEQ);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LES);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LEQ);
-    // InstructionMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OPEN);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SHORT);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MASTER_RLY);
-    // InstructionMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_COIL);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_RES);
-    // InstructionMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MOV);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_ADD);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SUB);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MUL);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_DIV);
-    // InstructionMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SHIFT_REG);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LUT);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_PWL);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_FMTD_STR);
-    // InstructionMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), InstructionMenuSeparator);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_UART_SEND);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_UART_RECV);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SET_PWM);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_READ_ADC);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_PERSIST);
-    // InstructionMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), InstructionMenuSeparator);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_NORMAL);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_NEGATE);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_SET_ONLY);
-    // gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_RESET_ONLY);
-
-    // // Creating labels for Simulation Menu
-    // MNU_COMPILE = gtk_menu_item_new_with_label("Compile");
-    // MNU_COMPILE_AS = gtk_menu_item_new_with_label("Compile As...");
-
-    // // Appending menu items to Compile menu
-    // gtk_menu_shell_append(GTK_MENU_SHELL (compile), MNU_COMPILE);
-    // gtk_menu_shell_append(GTK_MENU_SHELL (compile), MNU_COMPILE_AS);
-
-    // // Creating labels for Simulation Menu
-    // MNU_MANUAL = gtk_menu_item_new_with_label("Manual...");
-    // MNU_ABOUT = gtk_menu_item_new_with_label("About...");
-
-    // // Appending menu items to Help menu
-    // gtk_menu_shell_append(GTK_MENU_SHELL (help), MNU_MANUAL);
-    // gtk_menu_shell_append(GTK_MENU_SHELL (help), MNU_ABOUT);
-
-    // // Creating labels for Simulation Menu
-    // MNU_SIMULATION_MODE = gtk_check_menu_item_new_with_label("Simulation Mode");
-    // MNU_START_SIMULATION = gtk_menu_item_new_with_label("Start Real-Time Simulation");
-    // MNU_STOP_SIMULATION = gtk_menu_item_new_with_label("Halt Simulation");
-    // MNU_SINGLE_CYCLE = gtk_menu_item_new_with_label("Single Cycle");
-
-    // // Appending menu items to Simulate menu and adding separators
-    // gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_SIMULATION_MODE);
-    // gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_START_SIMULATION);
-    // gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_STOP_SIMULATION);
-    // gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_SINGLE_CYCLE);
-    // SimulateMenuSeparator = gtk_separator_menu_item_new();
-    // gtk_menu_shell_append(GTK_MENU_SHELL(SimulateMenu), SimulateMenuSeparator);
-
-    // // Creating submenus for each menu  
-    // gtk_menu_item_set_submenu(GTK_MENU_ITEM(FileLabel), FileMenu);
-    // gtk_menu_item_set_submenu(GTK_MENU_ITEM(EditLabel), EditMenu);
-    // gtk_menu_item_set_submenu(GTK_MENU_ITEM(SettingsLabel), settings);
-    // gtk_menu_item_set_submenu(GTK_MENU_ITEM(InstructionLabel), InstructionMenu);
-    // gtk_menu_item_set_submenu(GTK_MENU_ITEM(SimulateLabel), SimulateMenu);
-    // gtk_menu_item_set_submenu(GTK_MENU_ITEM(CompileLabel), compile);
-    // gtk_menu_item_set_submenu(GTK_MENU_ITEM(HelpLabel), help);
-
-    // // Appending the menu item to the menu bar
-    // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), FileLabel);
-    // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), EditLabel);
-    // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), SettingsLabel);
-    // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), InstructionLabel);
-    // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), SimulateLabel);
-    // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), CompileLabel);
-    // gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), HelpLabel);
-
-    // // Packing the menu bar into the box for alignment
-    // gtk_box_pack_start(GTK_BOX(MenuBox), TopMenu, FALSE, FALSE, 0);
-
-    // return MenuBox;
+    // Appending menu items (labels) to File menu and adding separators
+    gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_NEW);       // Appending menu items
+    gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_OPEN);
+    gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_SAVE);
+    gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_SAVE_AS);
+    FileMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), FileMenuSeparator);
+    gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_EXPORT);
+    FileMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), FileMenuSeparator);
+    gtk_menu_shell_append(GTK_MENU_SHELL (FileMenu), MNU_EXIT);
+
+    // Creating labels for Edit Menu
+    MNU_UNDO = gtk_menu_item_new_with_label("Undo");
+    MNU_REDO = gtk_menu_item_new_with_label("Redo");
+    MNU_INSERT_RUNG_BEFORE = gtk_menu_item_new_with_label("Insert rung Before");
+    MNU_INSERT_RUNG_AFTER = gtk_menu_item_new_with_label("Insert Rung After");
+    MNU_PUSH_RUNG_UP = gtk_menu_item_new_with_label("Move Selected Rung Up");
+    MNU_PUSH_RUNG_DOWN = gtk_menu_item_new_with_label("Move Selected Rung Down");
+    MNU_DELETE_ELEMENT = gtk_menu_item_new_with_label("Delete Selected Element");
+    MNU_DELETE_RUNG = gtk_menu_item_new_with_label("Delete Rung");
+
+    // Appending menu items to Edit menu and adding separators
+    gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_UNDO);    
+    gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_REDO);
+    EditMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append(GTK_MENU_SHELL(EditMenu), EditMenuSeparator);    
+    gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_INSERT_RUNG_BEFORE);    
+    gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_INSERT_RUNG_AFTER);    
+    gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_PUSH_RUNG_UP);    
+    gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_PUSH_RUNG_DOWN);
+    EditMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append(GTK_MENU_SHELL(EditMenu), EditMenuSeparator);    
+    gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_DELETE_ELEMENT);    
+    gtk_menu_shell_append(GTK_MENU_SHELL (EditMenu), MNU_DELETE_RUNG);
+
+    // Creating labels for Settings Menu
+    MNU_MCU_SETTINGS = gtk_menu_item_new_with_label ("MCU Parameters...");
+    MNU_MICRO_CONTROLLER = gtk_menu_item_new_with_label ("Microcontroller");
+
+    // Appending menu items to Settings menu
+    gtk_menu_shell_append (GTK_MENU_SHELL (settings), MNU_MCU_SETTINGS);
+    gtk_menu_shell_append (GTK_MENU_SHELL (settings), MNU_MICRO_CONTROLLER);
+
+    // Appending the microcontroller names to "Microcontroller" item
+    for (i = 0; i < NUM_SUPPORTED_MCUS; i++){
+    MNU_PROCESSOR[i] = gtk_check_menu_item_new_with_label (SupportedMcus[i].mcuName);
+    gtk_menu_shell_append (GTK_MENU_SHELL (ProcessorMenu), MNU_PROCESSOR[i]);
+    }
+
+    MNU_PROCESSOR[NUM_SUPPORTED_MCUS] = gtk_check_menu_item_new_with_label ("(no microcontroller)");
+    gtk_menu_shell_append (GTK_MENU_SHELL (ProcessorMenu), MNU_PROCESSOR[NUM_SUPPORTED_MCUS]);
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(MNU_MICRO_CONTROLLER), ProcessorMenu);
+
+    // Creating labels for Instruction Menu and adding separators
+    MNU_INSERT_COMMENT = gtk_menu_item_new_with_label("Insert Comment");
+    MNU_INSERT_CONTACTS = gtk_menu_item_new_with_label("Insert Contacts");
+    MNU_INSERT_OSR = gtk_menu_item_new_with_label("Insert OSR (One Shot Rising)");
+    MNU_INSERT_OSF = gtk_menu_item_new_with_label("Insert OSF (One Shot Falling)");
+    MNU_INSERT_TON = gtk_menu_item_new_with_label("Insert TON (Delayed Turn On)");
+    MNU_INSERT_TOF = gtk_menu_item_new_with_label("Insert TOF (Delayed Turn Off)");
+    MNU_INSERT_RTO = gtk_menu_item_new_with_label("Insert RTO (Retentive Delayed Turn On)");
+    MNU_INSERT_CTU = gtk_menu_item_new_with_label("Insert CTU (Count Up)");
+    MNU_INSERT_CTD = gtk_menu_item_new_with_label("Insert CTD (Count Down)");
+    MNU_INSERT_CTC = gtk_menu_item_new_with_label("Insert CTC (Count Circular)");
+    MNU_INSERT_EQU = gtk_menu_item_new_with_label("Insert EQU (Compare for Equals)");
+    MNU_INSERT_NEQ = gtk_menu_item_new_with_label("Insert NEQ (Compare for Not Equals)");
+    MNU_INSERT_GRT = gtk_menu_item_new_with_label("Insert GRT (Compare for Greater Than)");
+    MNU_INSERT_GEQ = gtk_menu_item_new_with_label("Insert GEQ (Compare for Greater Than or Equal)");
+    MNU_INSERT_LES = gtk_menu_item_new_with_label("Insert LES (Compare for Less Than)");
+    MNU_INSERT_LEQ = gtk_menu_item_new_with_label("Insert LEQ (Compare for Less Than or Equal)");
+    MNU_INSERT_OPEN = gtk_menu_item_new_with_label("Insert Open Circuit");
+    MNU_INSERT_SHORT = gtk_menu_item_new_with_label("Insert Short Circuit");
+    MNU_INSERT_MASTER_RLY = gtk_menu_item_new_with_label("Insert Master Control Relay");
+    MNU_INSERT_COIL = gtk_menu_item_new_with_label("Insert Coil");
+    MNU_INSERT_RES = gtk_menu_item_new_with_label("Insert RES (Counter/RTO Reset)");
+    MNU_INSERT_MOV = gtk_menu_item_new_with_label("Insert MOV (Move)");
+    MNU_INSERT_ADD = gtk_menu_item_new_with_label("Insert ADD (16-bit Integer Ad)");
+    MNU_INSERT_SUB = gtk_menu_item_new_with_label("Insert SUB (16-bit Integer Subtract)");
+    MNU_INSERT_MUL = gtk_menu_item_new_with_label("Insert MUL (16-bit Integer Multiply)");
+    MNU_INSERT_DIV = gtk_menu_item_new_with_label("Insert DIV (16-bit Integer Division)");
+    MNU_INSERT_SHIFT_REG = gtk_menu_item_new_with_label("Insert Shift Register");
+    MNU_INSERT_LUT = gtk_menu_item_new_with_label("Insert Look-Up Table");
+    MNU_INSERT_PWL = gtk_menu_item_new_with_label("Insert Piecewise Linear");
+    MNU_INSERT_FMTD_STR = gtk_menu_item_new_with_label("Insert Formatted String Over UART");
+    MNU_INSERT_UART_SEND = gtk_menu_item_new_with_label("Insert UART Send");
+    MNU_INSERT_UART_RECV = gtk_menu_item_new_with_label("Insert UART Receive");
+    MNU_INSERT_SET_PWM = gtk_menu_item_new_with_label("Insert Set PWM Output");
+    MNU_INSERT_READ_ADC = gtk_menu_item_new_with_label("Insert A/D Converter Read");
+    MNU_INSERT_PERSIST = gtk_menu_item_new_with_label("Insert Make Persistent");
+    MNU_MAKE_NORMAL = gtk_menu_item_new_with_label("Make Normal");
+    MNU_NEGATE = gtk_menu_item_new_with_label("Make Negated");
+    MNU_MAKE_SET_ONLY = gtk_menu_item_new_with_label("Make Set-Only");
+    MNU_MAKE_RESET_ONLY = gtk_menu_item_new_with_label("Make Reset-Only");
+
+    // Appending menu items to Instruction menu and adding separators
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_COMMENT);
+    InstructionMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CONTACTS);
+    InstructionMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OSR);
+    InstructionMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OSF);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_TON);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_TOF);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_RTO);
+    InstructionMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTU);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTD);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_CTC);
+    InstructionMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_EQU);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_NEQ);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_GRT);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_GEQ);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LES);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LEQ);
+    InstructionMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_OPEN);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SHORT);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MASTER_RLY);
+    InstructionMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_COIL);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_RES);
+    InstructionMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MOV);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_ADD);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SUB);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_MUL);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_DIV);
+    InstructionMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append (GTK_MENU_SHELL(InstructionMenu), InstructionMenuSeparator);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SHIFT_REG);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_LUT);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_PWL);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_FMTD_STR);
+    InstructionMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), InstructionMenuSeparator);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_UART_SEND);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_UART_RECV);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_SET_PWM);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_READ_ADC);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_INSERT_PERSIST);
+    InstructionMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), InstructionMenuSeparator);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_NORMAL);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_NEGATE);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_SET_ONLY);
+    gtk_menu_shell_append (GTK_MENU_SHELL (InstructionMenu), MNU_MAKE_RESET_ONLY);
+
+    // Creating labels for Simulation Menu
+    MNU_COMPILE = gtk_menu_item_new_with_label("Compile");
+    MNU_COMPILE_AS = gtk_menu_item_new_with_label("Compile As...");
+
+    // Appending menu items to Compile menu
+    gtk_menu_shell_append(GTK_MENU_SHELL (compile), MNU_COMPILE);
+    gtk_menu_shell_append(GTK_MENU_SHELL (compile), MNU_COMPILE_AS);
+
+    // Creating labels for Simulation Menu
+    MNU_MANUAL = gtk_menu_item_new_with_label("Manual...");
+    MNU_ABOUT = gtk_menu_item_new_with_label("About...");
+
+    // Appending menu items to Help menu
+    gtk_menu_shell_append(GTK_MENU_SHELL (help), MNU_MANUAL);
+    gtk_menu_shell_append(GTK_MENU_SHELL (help), MNU_ABOUT);
+
+    // Creating labels for Simulation Menu
+    MNU_SIMULATION_MODE = gtk_check_menu_item_new_with_label("Simulation Mode");
+    MNU_START_SIMULATION = gtk_menu_item_new_with_label("Start Real-Time Simulation");
+    MNU_STOP_SIMULATION = gtk_menu_item_new_with_label("Halt Simulation");
+    MNU_SINGLE_CYCLE = gtk_menu_item_new_with_label("Single Cycle");
+
+    // Appending menu items to Simulate menu and adding separators
+    gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_SIMULATION_MODE);
+    gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_START_SIMULATION);
+    gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_STOP_SIMULATION);
+    gtk_menu_shell_append(GTK_MENU_SHELL (SimulateMenu), MNU_SINGLE_CYCLE);
+    SimulateMenuSeparator = gtk_separator_menu_item_new();
+    gtk_menu_shell_append(GTK_MENU_SHELL(SimulateMenu), SimulateMenuSeparator);
+
+    // Creating submenus for each menu  
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(FileLabel), FileMenu);
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(EditLabel), EditMenu);
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(SettingsLabel), settings);
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(InstructionLabel), InstructionMenu);
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(SimulateLabel), SimulateMenu);
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(CompileLabel), compile);
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(HelpLabel), help);
+
+    // Appending the menu item to the menu bar
+    gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), FileLabel);
+    gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), EditLabel);
+    gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), SettingsLabel);
+    gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), InstructionLabel);
+    gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), SimulateLabel);
+    gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), CompileLabel);
+    gtk_menu_shell_append(GTK_MENU_SHELL(TopMenu), HelpLabel);
+
+    // Packing the menu bar into the box for alignment
+    gtk_box_pack_start(GTK_BOX(MenuBox), TopMenu, FALSE, FALSE, 0);
+
+    return MenuBox;
 }
 
 //-----------------------------------------------------------------------------
-// Adjust the size and visibility of the scrollbars as necessary, either due
-// to a change in the size of the program or a change in the size of the
-// window.
+// Create the standard Windows controls used in the main window: a Listview
+// for the I/O list, and a status bar for settings.
 //-----------------------------------------------------------------------------
-void RefreshScrollbars(void)
+void MakeMainWindowControls(void)
 {
-    // SCROLLINFO vert, horiz;
-    // SetUpScrollbars(&NeedHoriz, &horiz, &vert);
-    // SetScrollInfo(HorizScrollBar, SB_CTL, &horiz, TRUE);
-    // SetScrollInfo(VertScrollBar, SB_CTL, &vert, TRUE);
-
-    // RECT main;
-    // GetClientRect(MainWindow, &main);
-
-    // if(NeedHoriz) {
-    //     MoveWindow(HorizScrollBar, 0, IoListTop - ScrollHeight - 2,
-    //         main.right - ScrollWidth - 2, ScrollHeight, TRUE);
-    //     ShowWindow(HorizScrollBar, SW_SHOW);
-    //     EnableWindow(HorizScrollBar, TRUE);
-    // } else {
-    //     ShowWindow(HorizScrollBar, SW_HIDE);
-    // }
-    // MoveWindow(VertScrollBar, main.right - ScrollWidth - 2, 1, ScrollWidth,
-    //     NeedHoriz ? (IoListTop - ScrollHeight - 4) : (IoListTop - 3), TRUE);
-
-    // MoveWindow(VertScrollBar, main.right - ScrollWidth - 2, 1, ScrollWidth,
-    //     NeedHoriz ? (IoListTop - ScrollHeight - 4) : (IoListTop - 3), TRUE);
-
-    // InvalidateRect(MainWindow, NULL, FALSE);
+    GtkWidget* PackBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+    GtkWidget* grid = gtk_grid_new();
+    GtkWidget* pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
+
+    IoList = gtk_list_store_new (5, 
+                                G_TYPE_STRING,   
+                                G_TYPE_STRING,    
+                                G_TYPE_STRING,
+                                G_TYPE_STRING,
+                                G_TYPE_STRING);
+
+    int typeWidth = 85;
+    int pinWidth = 100;
+    int portWidth = 90;
+
+    // Creating a list
+    view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(IoList));
+    gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (IoList));
+
+    column = gtk_tree_view_column_new_with_attributes("Name",
+                                                    gtk_cell_renderer_text_new(),
+                                                    "text", LV_IO_NAME,
+                                                    NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+    gtk_tree_view_column_set_min_width (column, 250);
+
+    column = gtk_tree_view_column_new_with_attributes("Type",
+                                                    gtk_cell_renderer_spin_new(),
+                                                    "text", LV_IO_TYPE,
+                                                    NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+    gtk_tree_view_column_set_min_width (column, typeWidth);
+
+    column = gtk_tree_view_column_new_with_attributes("State",
+                                                    gtk_cell_renderer_text_new(),
+                                                    "text", LV_IO_STATE,
+                                                    NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+    gtk_tree_view_column_set_min_width (column, 100);
+
+    column = gtk_tree_view_column_new_with_attributes("Pin on Processor",
+                                                    gtk_cell_renderer_text_new(),
+                                                    "text", LV_IO_PIN,
+                                                    NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+    gtk_tree_view_column_set_min_width (column, pinWidth);
+
+    column = gtk_tree_view_column_new_with_attributes("MCU Port",
+                                                    gtk_cell_renderer_text_new(),
+                                                    "text", LV_IO_PORT,
+                                                    NULL);
+    gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
+    gtk_tree_view_column_set_min_width (column, portWidth);
+
+    // Appending Menus to grid
+    gtk_grid_attach (GTK_GRID (grid), MakeMainWindowMenus(), 0, 0, 1, 1);
+
+    // Creating Scrolled Window
+    GtkWidget* ScrollWindow = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ScrollWindow),
+				                          GTK_POLICY_AUTOMATIC, 
+				                          GTK_POLICY_ALWAYS);
+
+    // Creating a pane to separate Scrolled Window and other widgets
+    gtk_paned_add1 (GTK_PANED (pane), ScrollWindow);
+    gtk_paned_set_position (GTK_PANED (pane), 0);
+    gtk_widget_set_vexpand (ScrollWindow, TRUE);
+    gtk_widget_set_hexpand (ScrollWindow, TRUE);
+
+    // Appending tree view to pane and pane to grid
+    gtk_paned_add2 (GTK_PANED(pane), view);
+    gtk_paned_set_position (GTK_PANED (pane), 250);
+    gtk_grid_attach (GTK_GRID (grid), pane, 0, 0, 1, 1); 
+
+    // Creating Status Bar and attaching to grid
+    StatusBar = gtk_statusbar_new();
+    gtk_statusbar_push (GTK_STATUSBAR (StatusBar),
+                        gtk_statusbar_get_context_id (GTK_STATUSBAR (StatusBar), "Introduction"), 
+                        "LDMicro Started");
+
+    // Appneding Status Bar to box which is then added to Main Window
+    gtk_box_pack_start(GTK_BOX(PackBox), grid, TRUE, TRUE, 0);
+    gtk_box_pack_start(GTK_BOX(PackBox), StatusBar, FALSE, FALSE, 0);
+    gtk_container_add(GTK_CONTAINER(MainWindow), PackBox);
 }
 
 //-----------------------------------------------------------------------------
-// Cause the status bar and the list view to be in sync with the actual data
-// structures describing the settings and the I/O configuration. Listview
-// does callbacks to get the strings it displays, so it just needs to know
-// how many elements to populate.
+// Set up the title bar text for the main window; indicate whether we are in
+// simulation or editing mode, and indicate the filename.
 //-----------------------------------------------------------------------------
-void RefreshControlsToSettings(void)
+void UpdateMainWindowTitleBar(void)
 {
+    char line[PATH_MAX+100];
+    if(InSimulationMode) {
+        if(RealTimeSimulationRunning) {
+            strcpy(line, "LDmicro - Simulation (Running)");
+        } else {
+            strcpy(line, "LDmicro - Simulation (Stopped)");
+        }
+    } else {
+        strcpy(line, "LDmicro - Program Editor");
+    }
+    if(strlen(CurrentSaveFile) > 0) {
+        sprintf(line+strlen(line), " - %s", CurrentSaveFile);
+    } else {
+        strcat(line, " - (not yet saved)");
+    }
+    
+  gtk_window_set_title (GTK_WINDOW (MainWindow), line);
 }
 
 //-----------------------------------------------------------------------------
-// Regenerate the I/O list, keeping the selection in the same place if
-// possible.
+// Set the enabled state of the logic menu items to reflect where we are on
+// the schematic (e.g. can't insert two coils in series).
 //-----------------------------------------------------------------------------
-void GenerateIoListDontLoseSelection(void)
+void SetMenusEnabled(BOOL canNegate, BOOL canNormal, BOOL canResetOnly,
+    BOOL canSetOnly, BOOL canDelete, BOOL canInsertEnd, BOOL canInsertOther,
+    BOOL canPushDown, BOOL canPushUp, BOOL canInsertComment)
 {
-    // int i;
-    // GtkTreeIter* iter;
-    // GtkTreeModel **IoListPtr = (GtkTreeModel**)GTK_TREE_MODEL (IoList);
-    // gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
-    //                                 GTK_SELECTION_SINGLE);
-    // IoListSelectionPoint = -1;
-    // for(i = 0; i < Prog.io.count; i++) {
-    //     if(gtk_tree_selection_get_selected (gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
-    //                                     IoListPtr, iter)) {
-    //         IoListSelectionPoint = i;
-    //         break;
-    //     }
-    // }
-    // IoListSelectionPoint = GenerateIoList(IoListSelectionPoint);
-    // // can't just update the listview index; if I/O has been added then the
-    // // new selection point might be out of range till we refill it
-    // IoListOutOfSync = TRUE;
-    // RefreshControlsToSettings();
+    EnableMenuItem(EditMenu, MNU_PUSH_RUNG_UP,
+        canPushUp ? MF_ENABLED : MF_GRAYED);
+    EnableMenuItem(EditMenu, MNU_PUSH_RUNG_DOWN,
+        canPushDown ? MF_ENABLED : MF_GRAYED);
+    EnableMenuItem(EditMenu, MNU_DELETE_RUNG,
+        (Prog.numRungs > 1) ? MF_ENABLED : MF_GRAYED);
+
+    EnableMenuItem(InstructionMenu, MNU_NEGATE,
+        canNegate ? MF_ENABLED : MF_GRAYED);
+    EnableMenuItem(InstructionMenu, MNU_MAKE_NORMAL,
+        canNormal ? MF_ENABLED : MF_GRAYED);
+    EnableMenuItem(InstructionMenu, MNU_MAKE_RESET_ONLY,
+        canResetOnly ? MF_ENABLED : MF_GRAYED);
+    EnableMenuItem(InstructionMenu, MNU_MAKE_SET_ONLY,
+        canSetOnly ? MF_ENABLED : MF_GRAYED);
+
+    EnableMenuItem(InstructionMenu, MNU_INSERT_COMMENT,
+        canInsertComment ? MF_ENABLED : MF_GRAYED);
+
+    EnableMenuItem(EditMenu, MNU_DELETE_ELEMENT,
+        canDelete ? MF_ENABLED : MF_GRAYED);
+
+    int t;
+    t = canInsertEnd ? MF_ENABLED : MF_GRAYED;
+    EnableMenuItem(InstructionMenu, MNU_INSERT_COIL, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_RES, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_MOV, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_ADD, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_SUB, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_MUL, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_DIV, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_CTC, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_PERSIST, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_READ_ADC, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_SET_PWM, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_MASTER_RLY, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_SHIFT_REG, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_LUT, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_PWL, t);
+
+    t = canInsertOther ? MF_ENABLED : MF_GRAYED;
+    EnableMenuItem(InstructionMenu, MNU_INSERT_TON, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_TOF, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_OSR, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_OSF, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_RTO, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_CONTACTS, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_CTU, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_CTD, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_EQU, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_NEQ, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_GRT, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_GEQ, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_LES, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_LEQ, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_SHORT, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_OPEN, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_UART_SEND, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_UART_RECV, t);
+    EnableMenuItem(InstructionMenu, MNU_INSERT_FMTD_STR, t);
+}
+
+//-----------------------------------------------------------------------------
+// Set the enabled state of the undo/redo menus.
+//-----------------------------------------------------------------------------
+void SetUndoEnabled(BOOL undoEnabled, BOOL redoEnabled)
+{
+    // EnableMenuItem(EditMenu, MNU_UNDO, undoEnabled ? MF_ENABLED : MF_GRAYED);
+    // EnableMenuItem(EditMenu, MNU_REDO, redoEnabled ? MF_ENABLED : MF_GRAYED);
 }
 
 //-----------------------------------------------------------------------------
@@ -667,75 +609,156 @@ void GenerateIoListDontLoseSelection(void)
 //-----------------------------------------------------------------------------
 void ToggleSimulationMode(void)
 {
-    // InSimulationMode = !InSimulationMode;
-
-    // if(InSimulationMode) {
-    //     EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_ENABLED);
-    //     EnableMenuItem(SimulateMenu, MNU_SINGLE_CYCLE, MF_ENABLED);
-
-    //     EnableMenuItem(FileMenu, MNU_OPEN, MF_GRAYED);
-    //     EnableMenuItem(FileMenu, MNU_SAVE, MF_GRAYED);
-    //     EnableMenuItem(FileMenu, MNU_SAVE_AS, MF_GRAYED);
-    //     EnableMenuItem(FileMenu, MNU_NEW, MF_GRAYED);
-    //     EnableMenuItem(FileMenu, MNU_EXPORT, MF_GRAYED);
-
-    //     EnableMenuItem(TopMenu, 1, MF_GRAYED | MF_BYPOSITION);
-    //     EnableMenuItem(TopMenu, 2, MF_GRAYED | MF_BYPOSITION);
-    //     EnableMenuItem(TopMenu, 3, MF_GRAYED | MF_BYPOSITION);
-    //     EnableMenuItem(TopMenu, 5, MF_GRAYED | MF_BYPOSITION);
+    InSimulationMode = !InSimulationMode;
+    if(InSimulationMode) {
+        EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_ENABLED);
+        EnableMenuItem(SimulateMenu, MNU_SINGLE_CYCLE, MF_ENABLED);
+
+        EnableMenuItem(FileMenu, MNU_OPEN, MF_GRAYED);
+        EnableMenuItem(FileMenu, MNU_SAVE, MF_GRAYED);
+        EnableMenuItem(FileMenu, MNU_SAVE_AS, MF_GRAYED);
+        EnableMenuItem(FileMenu, MNU_NEW, MF_GRAYED);
+        EnableMenuItem(FileMenu, MNU_EXPORT, MF_GRAYED);
+
+        EnableMenuItem(TopMenu, EditMenu, MF_GRAYED);
+        EnableMenuItem(TopMenu, settings, MF_GRAYED);
+        EnableMenuItem(TopMenu, InstructionMenu, MF_GRAYED);
+        EnableMenuItem(TopMenu, compile, MF_GRAYED);
+    
+        CheckMenuItem(SimulateMenu, MNU_SIMULATION_MODE, MF_CHECKED);
+
+        // ClearSimulationData(); // simulation.cpp, ldmicro.h
+        // Recheck InSimulationMode, because there could have been a compile
+        // error, which would have kicked us out of simulation mode.
+        // if(UartFunctionUsed() && InSimulationMode) {
+        //     ShowUartSimulationWindow(); // simulate.cpp
+        // }
+    }
+    else {
+        RealTimeSimulationRunning = FALSE;
+        // KillTimer(MainWindow, TIMER_SIMULATE);
+
+        EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_GRAYED);
+        EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_GRAYED);
+        EnableMenuItem(SimulateMenu, MNU_SINGLE_CYCLE, MF_GRAYED);
+
+        EnableMenuItem(FileMenu, MNU_OPEN, MF_ENABLED);
+        EnableMenuItem(FileMenu, MNU_SAVE, MF_ENABLED);
+        EnableMenuItem(FileMenu, MNU_SAVE_AS, MF_ENABLED);
+        EnableMenuItem(FileMenu, MNU_NEW, MF_ENABLED);
+        EnableMenuItem(FileMenu, MNU_EXPORT, MF_ENABLED);
+
+        EnableMenuItem(TopMenu, EditMenu, MF_ENABLED);
+        EnableMenuItem(TopMenu, settings, MF_ENABLED);
+        EnableMenuItem(TopMenu, InstructionMenu, MF_ENABLED);
+        EnableMenuItem(TopMenu, compile, MF_ENABLED);
+
+        CheckMenuItem(SimulateMenu, MNU_SIMULATION_MODE, MF_UNCHECKED);
+
+        // if(UartFunctionUsed()) {
+        //     DestroyUartSimulationWindow();
+        // }
+        }
+
+    UpdateMainWindowTitleBar();
+}
+
+//-----------------------------------------------------------------------------
+// Cause the status bar and the list view to be in sync with the actual data
+// structures describing the settings and the I/O configuration. Listview
+// does callbacks to get the strings it displays, so it just needs to know
+// how many elements to populate.
+//-----------------------------------------------------------------------------
+void RefreshControlsToSettings(void)
+{   
+    int i;
+    gtk_tree_model_get_iter_first (GTK_TREE_MODEL(IoList), iter);
+    gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
+                                    GTK_SELECTION_SINGLE);
+    if(!IoListOutOfSync) {
+        IoListSelectionPoint = -1;
+        for(i = 0; i < Prog.io.count; i++) {
+            gtk_tree_model_iter_next (GTK_TREE_MODEL(IoList), iter);
+            if(gtk_tree_selection_get_selected (gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
+                                        IoListPtr, iter)) {
+                IoListSelectionPoint = i;
+                break;
+            }
+        }
+    }
+    gtk_list_store_clear (IoList);
+    IoListOutOfSync = FALSE;
+
+    if(Prog.mcu) {
+        gtk_statusbar_push (GTK_STATUSBAR (StatusBar),
+                        gtk_statusbar_get_context_id (GTK_STATUSBAR (StatusBar), "MCU Name"), 
+                        (gchar*)Prog.mcu->mcuName);
+        // SendMessage(StatusBar, SB_SETTEXT, 0, (LPARAM)Prog.mcu->mcuName);
+    } 
+    else {
+        // SendMessage(StatusBar, SB_SETTEXT, 0, (LPARAM)_("no MCU selected"));
+        gtk_statusbar_push (GTK_STATUSBAR (StatusBar),
+                        gtk_statusbar_get_context_id (GTK_STATUSBAR (StatusBar), "MCU Name"), 
+                        "no MCU selected");
+    }
+    for(i = 0; i < NUM_SUPPORTED_MCUS; i++) {
+        if(&SupportedMcus[i] == Prog.mcu) {
+            CheckMenuItem(ProcessorMenu, MNU_PROCESSOR[i], MF_CHECKED);
+        }
+        else {
+            CheckMenuItem(ProcessorMenu, MNU_PROCESSOR[i], MF_UNCHECKED);
+        }
+    }
+    // `(no microcontroller)' setting
+    if (!Prog.mcu){
+        CheckMenuItem(ProcessorMenu, MNU_PROCESSOR[NUM_SUPPORTED_MCUS], MF_CHECKED);
+    }
+    else {
+        CheckMenuItem(ProcessorMenu, MNU_PROCESSOR[NUM_SUPPORTED_MCUS], MF_UNCHECKED);
+    }
+}
+
+//-----------------------------------------------------------------------------
+// Regenerate the I/O list, keeping the selection in the same place if
+// possible.
+//-----------------------------------------------------------------------------
+void GenerateIoListDontLoseSelection(void)
+{
+    int i;
+    gtk_tree_model_get_iter_first (GTK_TREE_MODEL(IoList), iter);
+    gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
+                                    GTK_SELECTION_SINGLE);
+    IoListSelectionPoint = -1;
+    for(i = 0; i < Prog.io.count; i++) {
+        gtk_tree_model_iter_next (GTK_TREE_MODEL (IoList), iter);
+        if(gtk_tree_selection_get_selected (gtk_tree_view_get_selection(GTK_TREE_VIEW(view)),
+                                        IoListPtr, iter)) {
+            IoListSelectionPoint = i;
+            break;
+        }
+    }
+    // IoListSelectionPoint = GenerateIoList(IoListSelectionPoint);
+    
+    // can't just update the listview index; if I/O has been added then the
+    // new selection point might be out of range till we refill it
     
-    //     CheckMenuItem(SimulateMenu, MNU_SIMULATION_MODE, MF_CHECKED);
-
-    //     ClearSimulationData();
-    //     // Recheck InSimulationMode, because there could have been a compile
-    //     // error, which would have kicked us out of simulation mode.
-    //     if(UartFunctionUsed() && InSimulationMode) {
-    //         ShowUartSimulationWindow();
-    //     }
-    // } else {
-    //     RealTimeSimulationRunning = FALSE;
-    //     KillTimer(MainWindow, TIMER_SIMULATE);
-
-    //     EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_GRAYED);
-    //     EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_GRAYED);
-    //     EnableMenuItem(SimulateMenu, MNU_SINGLE_CYCLE, MF_GRAYED);
-
-    //     EnableMenuItem(FileMenu, MNU_OPEN, MF_ENABLED);
-    //     EnableMenuItem(FileMenu, MNU_SAVE, MF_ENABLED);
-    //     EnableMenuItem(FileMenu, MNU_SAVE_AS, MF_ENABLED);
-    //     EnableMenuItem(FileMenu, MNU_NEW, MF_ENABLED);
-    //     EnableMenuItem(FileMenu, MNU_EXPORT, MF_ENABLED);
-
-    //     EnableMenuItem(TopMenu, 1, MF_ENABLED | MF_BYPOSITION);
-    //     EnableMenuItem(TopMenu, 2, MF_ENABLED | MF_BYPOSITION);
-    //     EnableMenuItem(TopMenu, 3, MF_ENABLED | MF_BYPOSITION);
-    //     EnableMenuItem(TopMenu, 5, MF_ENABLED | MF_BYPOSITION);
-
-    //     CheckMenuItem(SimulateMenu, MNU_SIMULATION_MODE, MF_UNCHECKED);
-
-    //     if(UartFunctionUsed()) {
-    //         DestroyUartSimulationWindow();
-    //     }
-    // }
-
-    // UpdateMainWindowTitleBar();
-
-    // DrawMenuBar(MainWindow);
-    // InvalidateRect(MainWindow, NULL, FALSE);
-    // ListView_RedrawItems(IoList, 0, Prog.io.count - 1);
+    IoListOutOfSync = TRUE;
+    RefreshControlsToSettings();
 }
 
+
+
 //-----------------------------------------------------------------------------
 // Start real-time simulation. Have to update the controls grayed status
 // to reflect this.
 //-----------------------------------------------------------------------------
 void StartSimulation(void)
 {
-    // RealTimeSimulationRunning = TRUE;
-    // EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_GRAYED);
-    // EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_ENABLED);
+    RealTimeSimulationRunning = TRUE;
+    EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_GRAYED);
+    EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_ENABLED);
     // StartSimulationTimer();
-    // UpdateMainWindowTitleBar();
+    UpdateMainWindowTitleBar();
 }
 
 //-----------------------------------------------------------------------------
@@ -744,11 +767,11 @@ void StartSimulation(void)
 //-----------------------------------------------------------------------------
 void StopSimulation(void)
 {
-    // RealTimeSimulationRunning = FALSE;
+    RealTimeSimulationRunning = FALSE;
 
-    // EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_ENABLED);
-    // EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_GRAYED);
+    EnableMenuItem(SimulateMenu, MNU_START_SIMULATION, MF_ENABLED);
+    EnableMenuItem(SimulateMenu, MNU_STOP_SIMULATION, MF_GRAYED);
     // KillTimer(MainWindow, TIMER_SIMULATE);
 
-    // UpdateMainWindowTitleBar();
-}
+    UpdateMainWindowTitleBar();
+}
\ No newline at end of file