X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FWin32.cc;h=c2789984e6047594e3f9cbcc4e8a8db9361a3d37;hb=39c059dae76a46550b1aef86c77d40660ebe5c2f;hp=e5b0294b744135d9b1aa1993a003e4b843a5afc4;hpb=d857aefa0752d477c3cff97de5ed6c38c23a5301;p=org.ibex.core.git

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