From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 07:44:46 +0000 (+0000)
Subject: 2004/01/17 07:54:20
X-Git-Tag: RC3~154
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=230cb077accfdde49592c27f7c5aa09c0753e7ab

2004/01/17 07:54:20

darcs-hash:20040130074446-2ba56-c38572ec33966b7eac4b08df8fdbaa16f03e2d45.gz
---

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index e00ecf7..e8170cb 100644
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -257,7 +257,7 @@ public final class Box extends JSScope implements Scheduler.Task {
         if (x != this.x || y != this.y || width != this.width || height != this.height) {
             boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
             boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null;
-            do {
+            //do {
                 int thisx = parent == null ? 0 : this.x;
                 int thisy = parent == null ? 0 : this.y;
 
@@ -280,8 +280,8 @@ public final class Box extends JSScope implements Scheduler.Task {
                 (parent == null ? this : parent).dirty(thisx, thisy, this.width, this.height);
                 this.width = width; this.height = height; this.x = x; this.y = y;
                 dirty();
-            } while (false);
-            this.width = width; this.height = height; this.x = x; this.y = y;
+                //} while (false);
+                //this.width = width; this.height = height; this.x = x; this.y = y;
             if (sizechange) putAndTriggerTrapsAndCatchExceptions("SizeChange", T);
             if (poschange)  putAndTriggerTrapsAndCatchExceptions("PosChange", T);
         }
@@ -322,8 +322,8 @@ public final class Box extends JSScope implements Scheduler.Task {
             if (!child.test(PACKED)) {
                 child_x = child.x;
                 child_y = child.y;
-                child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - child.x);
-                child_height = child.test(VSHRINK) ? child.contentheight : min(child.maxheight, height - child.y);
+                child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - child_x);
+                child_height = child.test(VSHRINK) ? child.contentheight : min(child.maxheight, height - child_y);
                 child_width = max(child.minwidth, child_width);
                 child_height = max(child.minheight, child_height);
             } else {
@@ -543,8 +543,8 @@ public final class Box extends JSScope implements Scheduler.Task {
             MARK_RESIZE;
             dirty();
         case "fontsize": font = Font.getFont(font == null ? null : font.res, toInt(value)); MARK_RESIZE; dirty();
-        case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); }
-        case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); }
+        case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; dirty(); CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); }
+        case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; dirty(); CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); }
         case "titlebar":
             if (getSurface() != null && value != null) getSurface().setTitleBarText(JS.toString(value));
             super.put(name,value);
diff --git a/src/org/xwt/plat/Win32.cc b/src/org/xwt/plat/Win32.cc
index c278998..e5b0294 100644
--- a/src/org/xwt/plat/Win32.cc
+++ b/src/org/xwt/plat/Win32.cc
@@ -205,6 +205,14 @@ void org::xwt::plat::Win32::natInit() {
                                                (HWND__*)NULL, (HMENU__*)NULL,
                                                GetModuleHandle(NULL), (LPVOID)NULL);
             
+<<<<<<< Win32.cc
+            surface->hwnd = (jint)CreateWindow(wc.lpszClassName, TEXT(""),
+                                               (msg.wParam ? WS_NORMAL : WS_POPUP) | WS_SIZEBOX,
+                                               200, 200, 100, 100,
+                                               (HWND__*)NULL, (HMENU__*)NULL,
+                                               GetModuleHandle(NULL), (LPVOID)NULL);
+=======
+>>>>>>> 1.27
             SetFocus((HWND)surface->hwnd);
             surface->hwndCreated->release();