summaryrefslogtreecommitdiff
path: root/ldmicro/maincontrols.cpp
diff options
context:
space:
mode:
authorNatsuDrag92018-06-21 15:06:42 +0530
committerGitHub2018-06-21 15:06:42 +0530
commitf67a2745b9f0b54b7adbaa3f449d598a1491a99d (patch)
tree72c110ce855c41ff1b353f114ca8c0c0fe2fc8c4 /ldmicro/maincontrols.cpp
parent05cf6ae6b3ef0c6d799789dcb1dacf8302345e7f (diff)
parentc71f6baa52b84da1b072a4577d56f32fbd3b7106 (diff)
downloadLDMicroGtk-f67a2745b9f0b54b7adbaa3f449d598a1491a99d.tar.gz
LDMicroGtk-f67a2745b9f0b54b7adbaa3f449d598a1491a99d.tar.bz2
LDMicroGtk-f67a2745b9f0b54b7adbaa3f449d598a1491a99d.zip
Merge pull request #23 from NatsuDrag9/GUI_port
Gui port
Diffstat (limited to 'ldmicro/maincontrols.cpp')
-rw-r--r--ldmicro/maincontrols.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/ldmicro/maincontrols.cpp b/ldmicro/maincontrols.cpp
index 484303a..cd01ea9 100644
--- a/ldmicro/maincontrols.cpp
+++ b/ldmicro/maincontrols.cpp
@@ -521,7 +521,7 @@ HMENU MakeMainWindowMenus(void)
//-----------------------------------------------------------------------------
void MakeMainWindowControls(void)
{
- HWID PackBox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ HWID PackBoxMenu = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
HWID grid = gtk_grid_new();
/// Pane to separate Scrolled Window and other widgets
HWID pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
@@ -581,7 +581,7 @@ void MakeMainWindowControls(void)
/// Creating Scrolled Window
ScrollWindow = gtk_scrolled_window_new (NULL, NULL);
- HWID viewport = gtk_viewport_new (NULL,NULL);
+ HWID ViewPortMenu = gtk_viewport_new (NULL,NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ScrollWindow),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
@@ -589,8 +589,8 @@ void MakeMainWindowControls(void)
gtk_widget_set_vexpand(GTK_WIDGET(ScrollWindow), TRUE);
/// Adding DrawWindow to pane
- gtk_container_add (GTK_CONTAINER(viewport), DrawWindow);
- gtk_container_add (GTK_CONTAINER(ScrollWindow), viewport);
+ gtk_container_add (GTK_CONTAINER(ViewPortMenu), DrawWindow);
+ gtk_container_add (GTK_CONTAINER(ScrollWindow), ViewPortMenu);
gtk_paned_pack1 (GTK_PANED (pane), ScrollWindow, TRUE, TRUE);
gtk_paned_set_position (GTK_PANED (pane), 0);
@@ -606,9 +606,9 @@ void MakeMainWindowControls(void)
"Introduction"), "LDMicro Started");
/// Appneding Status Bar to box which is then added to Main Window
- gtk_box_pack_start(GTK_BOX(PackBox), grid, FALSE, TRUE, 0);
- gtk_box_pack_start(GTK_BOX(PackBox), StatusBar, FALSE, FALSE, 0);
- gtk_container_add(GTK_CONTAINER(MainWindow), PackBox);
+ gtk_box_pack_start(GTK_BOX(PackBoxMenu), grid, FALSE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(PackBoxMenu), StatusBar, FALSE, FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(MainWindow), PackBoxMenu);
}
//-----------------------------------------------------------------------------