rationalization and improvement of error handling in window class - gsl-shell.git - gsl-shell

diff --git a/agg-plot/window-cpp.h b/agg-plot/window-cpp.h
index 6c149d83..d0239d9a 100644
--- a/agg-plot/window-cpp.h
+++ b/agg-plot/window-cpp.h

@@ -7,6 +7,7 @@ extern "C" {

#include "canvas-window-cpp.h"

#include "resource-manager.h"

#include "lua-plot-cpp.h"

+#include "lua-cpp-utils.h"

#include "plot.h"

#include "drawable.h"

#include "rect.h"

@@ -18,10 +19,6 @@ extern "C" {

class window : public canvas_window {

public:

- enum error_e {

- invalid_split_string,

- invalid_slot,

- };

typedef plot<drawable, lua_management> plot_type;

int window_id;

@@ -77,7 +74,7 @@ public:

int attach(lua_plot *plot, const char *spec);

void draw_slot(int slot_id, bool update_req);

void refresh_slot(int slot_id);

- bool start(lua_State *L);

+ void start(lua_State *L, gslshell::ret_status& st);

void save_slot_image(int slot_id);

void restore_slot_image(int slot_id);

@@ -91,6 +88,4 @@ public:

virtual void on_draw();

virtual void on_resize(int sx, int sy);

-

- static const char * error_message(error_e code);

};