New upstream version 5.1.0upstream/5.1.0

1 files changed, 6 insertions, 2 deletions

diff --git a/app/wlib/gtklib/gtkint.h b/app/wlib/gtklib/gtkint.h
index da0d9ae..9f6be72 100644
--- a/app/wlib/gtklib/gtkint.h
+++ b/app/wlib/gtklib/gtkint.h
@@ -47,7 +47,7 @@ typedef enum {
 		B_RADIO, B_TOGGLE,
 		B_DRAW, B_MENU, B_MULTITEXT, B_MESSAGE, B_LINES,
 		B_MENUITEM, B_BOX,
-		B_BITMAP } wType_e;
+		B_BITMAP, B_STATUS } wType_e;
 
 typedef void (*repaintProcCallback_p)( wControl_p );
 typedef void (*doneProcCallback_p)( wControl_p b );
@@ -61,6 +61,7 @@ typedef void (*setTriggerCallback_p)( wControl_p b );
 		wPos_t realX, realY; \
 		wPos_t labelW; \
 		wPos_t w, h; \
+		int maximize_initially; \
 		long option; \
 		const char * labelStr; \
 		repaintProcCallback_p repaintProc; \
@@ -78,9 +79,12 @@ struct wWin_t {
 		wBool_t shown;                 /**< visibility state */
 		const char * nameStr;          /**< window name (not title) */
 		GtkWidget * menubar;           /**< menubar handle (if exists) */
+		int menu_height;
 		GdkGC * gc;                    /**< graphics context */
 		int gc_linewidth;              /**< ??? */
 		wBool_t busy;
+		int resizeTimer;		       /** resizing **/
+		int resizeW,resizeH;
 		int modalLevel;
 		};
 
@@ -113,7 +117,7 @@ struct wList_t {
 struct wListItem_t {
 		wBool_t active;
 		void * itemData;
-		const char * label;
+		char * label;
 		GtkLabel * labelG;
 		wBool_t selected;
 		wList_p listP;