New upstream version 3.0.2upstream/3.0.2

1 files changed, 25 insertions, 37 deletions

diff --git a/Panel.h b/Panel.h
index 4b517f3..480e2c0 100644
--- a/Panel.h
+++ b/Panel.h
@@ -1,5 +1,3 @@
-/* Do not edit this file. It was automatically generated. */
-
 #ifndef HEADER_Panel
 #define HEADER_Panel
 /*
@@ -9,8 +7,6 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
-//#link curses
-
 #include "Object.h"
 #include "Vector.h"
 #include "FunctionBar.h"
@@ -63,66 +59,58 @@ struct Panel_ {
 
 #define Panel_setDefaultBar(this_) do{ (this_)->currentBar = (this_)->defaultBar; }while(0)
 
-
-#ifndef MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-#ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-
 #define KEY_CTRL(l) ((l)-'A'+1)
 
 extern PanelClass Panel_class;
 
-extern Panel* Panel_new(int x, int y, int w, int h, bool owner, ObjectClass* type, FunctionBar* fuBar);
+Panel* Panel_new(int x, int y, int w, int h, bool owner, ObjectClass* type, FunctionBar* fuBar);
 
-extern void Panel_delete(Object* cast);
+void Panel_delete(Object* cast);
 
-extern void Panel_init(Panel* this, int x, int y, int w, int h, ObjectClass* type, bool owner, FunctionBar* fuBar);
+void Panel_init(Panel* this, int x, int y, int w, int h, ObjectClass* type, bool owner, FunctionBar* fuBar);
 
-extern void Panel_done(Panel* this);
+void Panel_done(Panel* this);
 
-extern void Panel_setSelectionColor(Panel* this, int color);
+void Panel_setSelectionColor(Panel* this, int color);
 
-extern RichString* Panel_getHeader(Panel* this);
+RichString* Panel_getHeader(Panel* this);
 
-extern void Panel_setHeader(Panel* this, const char* header);
+void Panel_setHeader(Panel* this, const char* header);
 
-extern void Panel_move(Panel* this, int x, int y);
+void Panel_move(Panel* this, int x, int y);
 
-extern void Panel_resize(Panel* this, int w, int h);
+void Panel_resize(Panel* this, int w, int h);
 
-extern void Panel_prune(Panel* this);
+void Panel_prune(Panel* this);
 
-extern void Panel_add(Panel* this, Object* o);
+void Panel_add(Panel* this, Object* o);
 
-extern void Panel_insert(Panel* this, int i, Object* o);
+void Panel_insert(Panel* this, int i, Object* o);
 
-extern void Panel_set(Panel* this, int i, Object* o);
+void Panel_set(Panel* this, int i, Object* o);
 
-extern Object* Panel_get(Panel* this, int i);
+Object* Panel_get(Panel* this, int i);
 
-extern Object* Panel_remove(Panel* this, int i);
+Object* Panel_remove(Panel* this, int i);
 
-extern Object* Panel_getSelected(Panel* this);
+Object* Panel_getSelected(Panel* this);
 
-extern void Panel_moveSelectedUp(Panel* this);
+void Panel_moveSelectedUp(Panel* this);
 
-extern void Panel_moveSelectedDown(Panel* this);
+void Panel_moveSelectedDown(Panel* this);
 
-extern int Panel_getSelectedIndex(Panel* this);
+int Panel_getSelectedIndex(Panel* this);
 
-extern int Panel_size(Panel* this);
+int Panel_size(Panel* this);
 
-extern void Panel_setSelected(Panel* this, int selected);
+void Panel_setSelected(Panel* this, int selected);
 
-extern void Panel_draw(Panel* this, bool focus);
+void Panel_draw(Panel* this, bool focus);
 
-extern void Panel_splice(Panel *this, Vector* from);
+void Panel_splice(Panel *this, Vector* from);
 
-extern bool Panel_onKey(Panel* this, int key);
+bool Panel_onKey(Panel* this, int key);
 
-extern HandlerResult Panel_selectByTyping(Panel* this, int ch);
+HandlerResult Panel_selectByTyping(Panel* this, int ch);
 
 #endif