Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=5b4d4d259ad74659e72e251f5fe7e60b20350a3e
commit 5b4d4d259ad74659e72e251f5fe7e60b20350a3e Author: James Buren <[email protected]> Date: Mon Apr 28 10:38:09 2014 -0500 move Widget to above UI diff --git a/src-new/ui.cpp b/src-new/ui.cpp index ab287fa..6af322e 100644 --- a/src-new/ui.cpp +++ b/src-new/ui.cpp @@ -5,6 +5,20 @@ #include <unistd.h> #include "ui.hpp" +// Widget Class Start +const unsigned char Widget::ALIGN_LEFT = (1 << 0); +const unsigned char Widget::ALIGN_RIGHT = (1 << 1); +const unsigned char Widget::ALIGN_TOP = (1 << 2); +const unsigned char Widget::ALIGN_BOTTOM = (1 << 3); + +const unsigned char Widget::EXPAND_HORIZONTAL = (1 << 0); +const unsigned char Widget::EXPAND_VERTICAL = (1 << 1); + +Widget::~Widget() +{ +} +// Widget Class End + // UI Class Start UI::~UI() { @@ -80,17 +94,3 @@ int UI::main(int /*argc*/, char **/*argv*/) return EXIT_SUCCESS; } // UI Class End - -// Widget Class Start -const unsigned char Widget::ALIGN_LEFT = (1 << 0); -const unsigned char Widget::ALIGN_RIGHT = (1 << 1); -const unsigned char Widget::ALIGN_TOP = (1 << 2); -const unsigned char Widget::ALIGN_BOTTOM = (1 << 3); - -const unsigned char Widget::EXPAND_HORIZONTAL = (1 << 0); -const unsigned char Widget::EXPAND_VERTICAL = (1 << 1); - -Widget::~Widget() -{ -} -// Widget Class End diff --git a/src-new/ui.hpp b/src-new/ui.hpp index 784d8a1..603d8f4 100644 --- a/src-new/ui.hpp +++ b/src-new/ui.hpp @@ -2,16 +2,6 @@ #include <string> -class UI -{ - public: - virtual ~UI(); - void printError(const std::string &line); - bool checkTTY(int fd); - bool setSignalInterrupt(int sig, bool interrupt); - virtual int main(int argc, char **argv); -}; - class Widget { public: @@ -25,3 +15,13 @@ class Widget virtual ~Widget(); }; + +class UI +{ + public: + virtual ~UI(); + void printError(const std::string &line); + bool checkTTY(int fd); + bool setSignalInterrupt(int sig, bool interrupt); + virtual int main(int argc, char **argv); +}; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
