From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 08:04:02 +0000 (+0000)
Subject: 2004/01/18 01:27:16
X-Git-Tag: RC3~150
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=39c059dae76a46550b1aef86c77d40660ebe5c2f

2004/01/18 01:27:16

darcs-hash:20040130080402-2ba56-1d4829fed80bf74bb24b3604cd827cd65a2b10db.gz
---

diff --git a/src/org/xwt/plat/Win32.cc b/src/org/xwt/plat/Win32.cc
index e5b0294..c278998 100644
--- a/src/org/xwt/plat/Win32.cc
+++ b/src/org/xwt/plat/Win32.cc
@@ -205,14 +205,6 @@ 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();