diff options
| author | Rohit | 2018-05-28 14:12:11 +0530 |
|---|---|---|
| committer | Rohit | 2018-05-28 14:12:11 +0530 |
| commit | bc3108e03a60505e5320bb18e67e9bed9142f41b (patch) | |
| tree | 2a484851b4e35796177d911ae6460d6f6e9df4e3 /ldmicro | |
| parent | 652aa0abde66af946be4f9771600510d686cdbf7 (diff) | |
| download | LDMicroGtk-bc3108e03a60505e5320bb18e67e9bed9142f41b.tar.gz LDMicroGtk-bc3108e03a60505e5320bb18e67e9bed9142f41b.tar.bz2 LDMicroGtk-bc3108e03a60505e5320bb18e67e9bed9142f41b.zip | |
Ported the MakeMainWindowMenus function
Diffstat (limited to 'ldmicro')
| -rw-r--r-- | ldmicro/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ldmicro/includes/ldmicro.h | 4 | ||||
| -rw-r--r-- | ldmicro/linuxUI.cpp | 36 |
3 files changed, 39 insertions, 5 deletions
diff --git a/ldmicro/CMakeLists.txt b/ldmicro/CMakeLists.txt index 1becba8..e0b96a9 100644 --- a/ldmicro/CMakeLists.txt +++ b/ldmicro/CMakeLists.txt @@ -58,8 +58,8 @@ IF ( GTK3_FOUND ) ENDIF ( GTK3_FOUND) ## Dummy compile and install to test linuxUI -## to compile LDmicro uncomment the below 2 line2 +## to compile LDmicro uncomment the below 2 lines #add_executable (LDMicro ldmicro.cpp)# miscutil.cpp draw_outputdev.cpp) # install (TARGETS LDMicro DESTINATION bin) -add_executable (linuxUI testMain.cpp) +add_executable (linuxUI linuxUI.cpp testMain.cpp) install (TARGETS linuxUI DESTINATION bin) diff --git a/ldmicro/includes/ldmicro.h b/ldmicro/includes/ldmicro.h index 2c6f720..214ee3b 100644 --- a/ldmicro/includes/ldmicro.h +++ b/ldmicro/includes/ldmicro.h @@ -501,7 +501,7 @@ typedef struct McuIoInfoTag { #define NUM_SUPPORTED_MCUS 16 - +/* //----------------------------------------------- // Function prototypes @@ -777,5 +777,5 @@ void CompileAnsiC(char *outFile); void CompileInterpreted(char *outFile); //Arduino.cpp void CompileArduino(char *outFile); - +*/ #endif diff --git a/ldmicro/linuxUI.cpp b/ldmicro/linuxUI.cpp index 854ed09..074efc7 100644 --- a/ldmicro/linuxUI.cpp +++ b/ldmicro/linuxUI.cpp @@ -1,9 +1,43 @@ #include "linuxUI/linuxUI.h" +/// Menu Variables +HWID window; +HWID menu_box; // Box for alignment +HWID packed_menu_box; // Stores the packed box +HWID FileMenu; // File Menu +HWID EditMenu; // Edit Menu +HWID settings; // Settings Menu +HWID ProcessorMenu; // Processor Menu +HWID InstructionMenu; // Instruction Menu +HWID compile; // Compile Menu +HWID help; // Help Menu +HWID SimulateMenu; // Simulate Menu +HWID menu_bar; // Menu Bar +HWID file_label; // File menu label +HWID edit_label; // Edit menu label +HWID instruction_label; // Instruction menu label +HWID settings_label; // Settings menu label +HWID compile_label; // Compile menu label +HWID help_label; // Help menu label +HWID simulate_label; // Simulate menu label +HWID file_menu_items; // File menu item +HWID edit_menu_items; // Edit menu item +HWID instruction_menu_items; // Instruction menu item +HWID settings_menu_items; // Settings menu item +HWID processor_menu_items; // Processor menu items +HWID compile_menu_items; // Compile menu item +HWID help_menu_items; // Help menu item +HWID simulate_menu_items; // Simulate menu item +HWID file_menu_separator; // File menu separator +HWID edit_menu_separator; // Edit menu separator +HWID instruction_menu_separator; // Instruction menu separator +HWID simulate_menu_separator; // Simulate menu separator + + /// Wraper function for gtk_window_has_toplevel_focus BOOL isFocus(HWND window) { - return (BOOL) gtk_window_has_toplevel_focus(GTK_WINDOW(window))); + return (BOOL) gtk_window_has_toplevel_focus(GTK_WINDOW(window)); } COLORREF RGB(int red, int green, int blue) |