fix

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@703 b9cfdab3-6d41-4d17-bbe4-086880011989

include/Mw/Resource/Icon.h

@@ -92,7 +92,6 @@ MWDECL MwU32 MwIconUp[];
  */
 MWDECL MwU32 MwIconWarning[];
 
-
 #ifdef __cplusplus
 }
 #endif

src/dialog/colorpicker.c

@@ -354,13 +354,16 @@ MwWidget MwColorPicker(MwWidget handle, const char* title) {
 	color_picker_t* wheel;
 	MwWidget	window;
 	MwSizeHints	sh;
+	int		ww = MwGetInteger(handle, MwNwidth);
+	int		wh = MwGetInteger(handle, MwNheight);
 
-	p.x = p.y = 0;
+	p.x = (ww - WIN_SIZE) / 2;
+	p.y = (wh - WIN_SIZE) / 2;
 
 	sh.min_width = sh.max_width = WIN_SIZE;
 	sh.min_height = sh.max_height = WIN_SIZE;
 
-	window = MwVaCreateWidget(MwWindowClass, "main", handle, MwDEFAULT, MwDEFAULT,
+	window = MwVaCreateWidget(MwWindowClass, "main", handle, 0, 0,
 				  WIN_SIZE, WIN_SIZE,
 				  MwNtitle, title,
 				  MwNsizeHints, &sh,
@@ -372,8 +375,10 @@ MwWidget MwColorPicker(MwWidget handle, const char* title) {
 	MwAddUserHandler(window, MwNtickHandler, color_picker_tick, wheel);
 	MwAddTickList(window);
 
+	MwLLShow(window->lowlevel, 0);
 	MwLLDetach(window->lowlevel, &p);
 	MwLLMakePopup(window->lowlevel, handle->lowlevel);
+	MwLLShow(window->lowlevel, 1);
 
 	return window;
 }

src/dialog/filechooser.c

@@ -468,15 +468,15 @@ MwWidget MwFileChooser(MwWidget handle, const char* title) {
 
 	memset(fc, 0, sizeof(*fc));
 
-	p.x = 0;
-	p.y = 0;
-
 	w      = 700;
 	h      = w * 2 / 3;
-	window = MwVaCreateWidget(MwWindowClass, "filechooser", handle, ww, wh, w, h,
+	window = MwVaCreateWidget(MwWindowClass, "filechooser", handle, 0, 0, w, h,
 				  MwNtitle, title,
 				  NULL);
 
+	p.x = (ww - w) / 2;
+	p.y = (wh - h) / 2;
+
 	fc->history_seek = 0;
 
 	fc->dir	     = MwLoadIcon(window, MwIconDirectory);
@@ -501,8 +501,10 @@ MwWidget MwFileChooser(MwWidget handle, const char* title) {
 	scan(window, path, 1);
 	free(path);
 
+	MwLLShow(handle->lowlevel, 0);
 	MwLLDetach(window->lowlevel, &p);
 	MwLLMakePopup(window->lowlevel, handle->lowlevel);
+	MwLLShow(handle->lowlevel, 1);
 
 	return window;
 }

src/dialog/messagebox.c

@@ -100,9 +100,9 @@ MwWidget MwMessageBox(MwWidget handle, const char* text, const char* title, unsi
 			       NULL);
 
 	MwLLShow(window->lowlevel, 0);
+	MwLLDetach(window->lowlevel, &p);
 	MwLLSetSizeHints(window->lowlevel, w, h, w, h);
 	MwLLMakePopup(window->lowlevel, handle->lowlevel);
-	MwLLDetach(window->lowlevel, &p);
 	MwLLShow(window->lowlevel, 1);
 
 	MwAddUserHandler(window, MwNcloseHandler, messagebox_close, NULL);

src/icon/back.c

@@ -443,5 +443,4 @@ MwU32 MwIconBack[] = {
     0xCCFFFF00,
     0xCCFFFF00,
     0xCCFFFF00,
-	0
-};
+    0};

src/icon/clock.c

@@ -2307,5 +2307,4 @@ MwU32 MwIconClock[] = {
     0x00000000,
     0x00000000,
     0x00000000,
-	0
-};
+    0};

src/icon/computer.c

@@ -259,5 +259,4 @@ MwU32 MwIconComputer[] = {
     0x00000000,
     0x00000000,
     0x00000000,
-	0
-};
+    0};

src/icon/directory.c

@@ -259,5 +259,4 @@ MwU32 MwIconDirectory[] = {
     0x2B251DFF,
     0xC0C0C000,
     0xC0C0C000,
-	0
-};
+    0};

src/icon/down.c

@@ -443,5 +443,4 @@ MwU32 MwIconDown[] = {
     0xCCFFFF00,
     0xCCFFFF00,
     0xCCFFFF00,
-	0
-};
+    0};

src/icon/error.c

@@ -2307,5 +2307,4 @@ MwU32 MwIconError[] = {
     0x00000000,
     0x00000000,
     0x00000000,
-	0
-};
+    0};

src/icon/file.c

@@ -259,5 +259,4 @@ MwU32 MwIconFile[] = {
     0xC0C0C000,
     0xC0C0C000,
     0xC0C0C000,
-	0
-};
+    0};

src/icon/forward.c

@@ -443,5 +443,4 @@ MwU32 MwIconForward[] = {
     0xCCFFFF00,
     0xCCFFFF00,
     0xCCFFFF00,
-	0
-};
+    0};

src/icon/info.c

@@ -2307,5 +2307,4 @@ MwU32 MwIconInfo[] = {
     0x00000000,
     0x00000000,
     0x00000000,
-	0
-};
+    0};

src/icon/left.c

@@ -443,5 +443,4 @@ MwU32 MwIconLeft[] = {
     0xCCFFFF00,
     0xCCFFFF00,
     0xCCFFFF00,
-	0
-};
+    0};

src/icon/news.c

@@ -2307,5 +2307,4 @@ MwU32 MwIconNews[] = {
     0x00000000,
     0x00000000,
     0x00000000,
-	0
-};
+    0};

src/icon/note.c

@@ -2307,5 +2307,4 @@ MwU32 MwIconNote[] = {
     0x00000000,
     0x00000000,
     0x00000000,
-	0
-};
+    0};

src/icon/right.c

@@ -443,5 +443,4 @@ MwU32 MwIconRight[] = {
     0xCCFFFF00,
     0xCCFFFF00,
     0xCCFFFF00,
-	0
-};
+    0};

src/icon/search.c

@@ -443,5 +443,4 @@ MwU32 MwIconSearch[] = {
     0x000000FF,
     0xCCFFFF00,
     0xCCFFFF00,
-	0
-};
+    0};

src/icon/up.c

@@ -443,5 +443,4 @@ MwU32 MwIconUp[] = {
     0xCCFFFF00,
     0xCCFFFF00,
     0xCCFFFF00,
-	0
-};
+    0};

src/icon/warning.c

@@ -2307,5 +2307,4 @@ MwU32 MwIconWarning[] = {
     0x00000000,
     0x00000000,
     0x00000000,
-	0
-};
+    0};

src/widget/opengl.c

@@ -90,7 +90,8 @@ static int create(MwWidget handle) {
 		attribs[3] = 24;
 		attribs[4] = None;
 
-		while(glpath[glincr] != NULL && (o->lib = MwDynamicOpen(glpath[glincr++])) == NULL);
+		while(glpath[glincr] != NULL && (o->lib = MwDynamicOpen(glpath[glincr++])) == NULL)
+			;
 
 		o->glXChooseVisual   = (MWglXChooseVisual)MwDynamicSymbol(o->lib, "glXChooseVisual");
 		o->glXCreateContext  = (MWglXCreateContext)MwDynamicSymbol(o->lib, "glXCreateContext");