Changeset 528 for trunk/thune/gl/gui.h

Timestamp:

05/30/08 18:36:20 (6 months ago)

Author:

krobillard

Message:

GL testfw reload works again.
Added UG_GUI_THROW macro to be used by widget event handlers.
Added gui_matchArgs() and GUI_PARSE macros.

Files:

• trunk/thune/gl/gui.h (modified) (4 diffs)

trunk/thune/gl/gui.h

@@ -67 +67 @@
     int16_t maxW;
     int16_t maxH;
-    int8_t  weightX;
-    int8_t  weightY;
-    int8_t  policyX;
-    int8_t  policyY;
+    uint8_t weightX;
+    uint8_t weightY;
+    uint8_t policyX;
+    uint8_t policyY;
 }
 GSizeHint;
@@ -149 +149 @@
 
 GWidget* gui_allocWidget( GUI*, int classId );
-//void     gui_freeWidget( GUI*, GWidgetId );
 GWidget* gui_widgetPtr( GUI*, GWidgetId );
 void     gui_link( GUI*, GWidget* parent, GWidgetId child );
-//void     gui_unlink( GUI*, GWidgetId );
 void     gui_enable( GUI*, GWidget*, int active );
 void     gui_show( GUI*, GWidget*, int show );
@@ -158 +156 @@
 void     gui_render( GUI*, GWidgetId );
 GWidget* gui_parseLayout( GUI*, GWidget* parent, GMakeState* );
+const UCell* gui_matchArgs( GMakeState* ms, int argc, ... );
 GWidget* gui_root( const GUI* ui, GWidgetId id );
 void     gui_initRectCoord( UCell*, GWidget*, int len );
@@ -165 +164 @@
 
 
+#define GUI_PARSE_ERR(msg) \
+    ms->error = msg; \
+    return 0
+
+#define GUI_PARSE_ALLOC(wp) \
+    wp = gui_allocWidget(ui, classId); \
+    if(! wp) { GUI_PARSE_ERR( "allocWidget failed" ); }
+
+
 #endif /*GUI_H*/