diff options
Diffstat (limited to 'Dalos')
-rw-r--r-- | Dalos/Console.cc | 8 | ||||
-rw-r--r-- | Dalos/Console.h | 8 | ||||
-rw-r--r-- | Dalos/Hexview.cc | 6 | ||||
-rw-r--r-- | Dalos/Hexview.h | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/Dalos/Console.cc b/Dalos/Console.cc index 51b35f9..8b66764 100644 --- a/Dalos/Console.cc +++ b/Dalos/Console.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: Console.cc,v 1.8 2006-02-09 16:59:55 pixel Exp $ */ +/* $Id: Console.cc,v 1.9 2006-10-28 16:50:34 pixel Exp $ */ #include <SDL.h> #include <SDL_thread.h> @@ -31,7 +31,7 @@ #include <glshape.h> -#include <font.h> +#include <Font.h> #include <Console.h> @@ -213,8 +213,8 @@ void console::console_keyevent::up(SDL_keysym k) { old_handler->up(k); } -console::console(mogltk::shape * sh, mogltk::widget * father, int y, int _nlines) : - widget(father, 0, y, father->GetW(), _nlines * 13, 0, "console", sh), nlines(_nlines), page(0), protect_add_line(SDL_CreateMutex()) { +console::console(mogltk::Shape * sh, mogltk::Widget * father, int y, int _nlines) : + Widget(father, 0, y, father->GetW(), _nlines * 13, 0, "console", sh), nlines(_nlines), page(0), protect_add_line(SDL_CreateMutex()) { SetVisible(false); } diff --git a/Dalos/Console.h b/Dalos/Console.h index e818aba..16b1029 100644 --- a/Dalos/Console.h +++ b/Dalos/Console.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: Console.h,v 1.6 2006-02-02 11:01:12 pixel Exp $ */ +/* $Id: Console.h,v 1.7 2006-10-28 16:50:34 pixel Exp $ */ #ifndef __CONSOLE_H__ #define __CONSOLE_H__ @@ -28,16 +28,16 @@ #include <Buffer.h> #include <engine.h> -#include <widgets.h> +#include <Widgets.h> -class console : public mogltk::widget { +class console : public mogltk::Widget { public: class console_keyevent : public mogltk::engine::keyevent { public: virtual void down(SDL_keysym k); virtual void up(SDL_keysym k); }; - console(mogltk::shape * sh, mogltk::widget * father, int y, int _nlines); + console(mogltk::Shape * sh, mogltk::Widget * father, int y, int _nlines); virtual ~console() throw (GeneralException); void add_line(const String & s); void page_reset(); diff --git a/Dalos/Hexview.cc b/Dalos/Hexview.cc index f523e8d..ddcf00b 100644 --- a/Dalos/Hexview.cc +++ b/Dalos/Hexview.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: Hexview.cc,v 1.6 2006-02-02 17:25:28 pixel Exp $ */ +/* $Id: Hexview.cc,v 1.7 2006-10-28 16:50:34 pixel Exp $ */ #include <SDL.h> @@ -80,8 +80,8 @@ void hexview::hexview_keyevent::up(SDL_keysym k) { old_handler->up(k); } -hexview::hexview(mogltk::shape * sh, mogltk::widget * father) : - widget(father, 0, 0, father->GetW(), father->GetH(), 0, "hexview", sh), h(0), width(16), offset(0), offset_loaded(-1), size_loaded(0), data(0), virtual_base(0), shift(0) +hexview::hexview(mogltk::Shape * sh, mogltk::Widget * father) : + Widget(father, 0, 0, father->GetW(), father->GetH(), 0, "hexview", sh), h(0), width(16), offset(0), offset_loaded(-1), size_loaded(0), data(0), virtual_base(0), shift(0) { nlines = GetH() / 13; CurrentHexview = this; } diff --git a/Dalos/Hexview.h b/Dalos/Hexview.h index 4bee1f8..845012f 100644 --- a/Dalos/Hexview.h +++ b/Dalos/Hexview.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: Hexview.h,v 1.5 2006-02-02 11:01:12 pixel Exp $ */ +/* $Id: Hexview.h,v 1.6 2006-10-28 16:50:34 pixel Exp $ */ #ifndef __HEXVIEW_H__ #define __HEXVIEW_H__ @@ -25,14 +25,14 @@ #include <engine.h> #include <widgets.h> -class hexview : public mogltk::widget { +class hexview : public mogltk::Widget { public: class hexview_keyevent : public mogltk::engine::keyevent { public: virtual void down(SDL_keysym k); virtual void up(SDL_keysym k); }; - hexview(mogltk::shape * sh, mogltk::widget * father); + hexview(mogltk::Shape * sh, mogltk::Widget * father); virtual ~hexview() throw (GeneralException); void set_virtual_base(int _virtual_base); int get_nlines(); |