GUI refactoring...

[apple2] / src / gui / gui.cpp

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index fa652146737a3f0a8ebc3c513c89f772b59ec02c..408f4b02be28321cdda3e7f56f8559739b94cbc0 100755 (executable)
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -21,6 +21,7 @@
 #include "gui.h"
 #include "menu.h"                                                              // Element class methods are pulled in here...
 #include "window.h"
+#include "button.h"
 #include "video.h"
 
 // Debug support
@@ -43,7 +44,9 @@ GUI::GUI(SDL_Surface * surface): menuItem(new MenuItems())
 //     windowList.push_back(new Menu());
 
 // Create drive windows, and config windows here...
-
+       windowList.push_back(new Window(30, 30, 200, 100));
+       windowList.push_back(new Window(30, 140, 200, 100));
+       windowList.push_back(new Button(30, 250, "Click!"));
 }
 
 GUI::~GUI()
@@ -96,6 +99,7 @@ void GUI::Run(void)
        SDL_EnableKeyRepeat(150, 75);
 
        // Initial update... [Now handled correctly in the constructor]
+       // Uh, still needed here, though... Only makes sense that it should
        for(i=windowList.begin(); i!=windowList.end(); i++)
                (*i)->Draw();