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 (file)
--- 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();