0
@@ -47,7 +47,7 @@ void shoes_native_init()
0
   InitCtrlEx.dwICC = ICC_PROGRESS_CLASS;
0
   InitCommonControlsEx(&InitCtrlEx);
0
   shoes_classex_init();
0
-  shoes_world->hidden = CreateWindow(SHOES_HIDDENCLS, SHOES_HIDDENCLS, WS_OVERLAPPEDWINDOW,      
0
+  shoes_world->os.hidden = CreateWindow(SHOES_HIDDENCLS, SHOES_HIDDENCLS, WS_OVERLAPPEDWINDOW,
0
     CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, shoes_world->os.instance, NULL);
0
 }
0
 
0
@@ -83,7 +83,7 @@ int shoes_windows_catch_message(unsigned int name, VALUE obj, void *data) {
0
 
0
 int shoes_native_message(unsigned int name, VALUE obj, void *data)
0
 {
0
-  return SendMessage(shoes_world->hiddenwnd, SHOES_WM_MESSAGE + name, obj, (LPARAM)data);
0
+  return SendMessage(shoes_world->os.hidden, SHOES_WM_MESSAGE + name, obj, (LPARAM)data);
0
 }
0
 
0
 void shoes_native_slot_mark(SHOES_SLOT_OS *slot)
0
@@ -688,18 +688,18 @@ shoes_classex_init()
0
 {
0
   shoes_code code = SHOES_OK;
0
 
0
-  shoes_world->hiddenex.cbSize = sizeof(WNDCLASSEX);
0
-  shoes_world->hiddenex.style = 0;
0
-  shoes_world->hiddenex.lpfnWndProc = (WNDPROC)shoes_hidden_win32proc;
0
-  shoes_world->hiddenex.cbClsExtra = 0;
0
-  shoes_world->hiddenex.cbWndExtra = 0;
0
-  shoes_world->hiddenex.hInstance = shoes_world->os.instance;
0
-  shoes_world->hiddenex.hIcon = NULL;
0
-  shoes_world->hiddenex.hCursor = NULL;
0
-  shoes_world->hiddenex.hbrBackground = NULL;
0
-  shoes_world->hiddenex.lpszMenuName = NULL;
0
-  shoes_world->hiddenex.lpszClassName = SHOES_HIDDENCLS;
0
-  shoes_world->hiddenex.hIconSm = NULL;
0
+  shoes_world->os.hiddenex.cbSize = sizeof(WNDCLASSEX);
0
+  shoes_world->os.hiddenex.style = 0;
0
+  shoes_world->os.hiddenex.lpfnWndProc = (WNDPROC)shoes_hidden_win32proc;
0
+  shoes_world->os.hiddenex.cbClsExtra = 0;
0
+  shoes_world->os.hiddenex.cbWndExtra = 0;
0
+  shoes_world->os.hiddenex.hInstance = shoes_world->os.instance;
0
+  shoes_world->os.hiddenex.hIcon = NULL;
0
+  shoes_world->os.hiddenex.hCursor = NULL;
0
+  shoes_world->os.hiddenex.hbrBackground = NULL;
0
+  shoes_world->os.hiddenex.lpszMenuName = NULL;
0
+  shoes_world->os.hiddenex.lpszClassName = SHOES_HIDDENCLS;
0
+  shoes_world->os.hiddenex.hIconSm = NULL;
0
 
0
   if (!RegisterClassEx(&shoes_world->os.hiddenex))
0
   {