Changeset 34373 for lang/objective-cplusplus

Timestamp:

07/09/09 15:40:16 (4 years ago)

Author:

saturday06

Message:

test

Location:

lang/objective-cplusplus/i3/trunk

Files:

• src/gui-windows/InputWindowPlatform.cpp (modified) (2 diffs)
• src/mil/include/mil/Mil.h (modified) (1 diff)
• src/mil/include/mil/ModuleCommon.h (modified) (8 diffs)
• src/mil/include/mil/gui-windows/GuiModule.h (modified) (3 diffs)
• windows/mil_test.vcproj (modified) (5 diffs)

lang/objective-cplusplus/i3/trunk/src/gui-windows/InputWindowPlatform.cpp

@@ -129 +129 @@
     memset((void*)&ce, 0, sizeof(ce));
     is_dwm_extend_frame_into_client_area = 0;
-    layout.icon_edit_space = 2;
+    layout.icon_edit_space = 1;
     layout.margin_right = 5;
 #ifdef _WIN32_WCE
@@ -714 +714 @@
     SetFocus(hEdit);
     setWindow(hWnd);
-    wndproc.set(hWnd);
     hSharedEdit.store(hEdit);
 

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/Mil.h

@@ -87 +87 @@
 */
 typedef int SFINAE_CONDITION;
-const int SFINAE_DUMMY_VALUE = 0;
+const int SFINAE_DUMMY_VALUE = (0);
 
 }

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/ModuleCommon.h

@@ -37 +37 @@
     };
     MemoryList* memory;
-    typedef int isReturnMemoryEvent;
+    typedef SFINAE_CONDITION IsReturnMemoryEvent;
 };
 
@@ -109 +109 @@
 #ifdef DEBUG_PRODUCER
     {
-        DebugInfo* d = (DebugInfo*)((char*)memory - sizeof(DebugInfo));
+                memory = (void*)((char*)memory - sizeof(DebugInfo));
+        DebugInfo* d = (DebugInfo*)memory;
         BOOST_ASSERT(d->os_thread_id  == GetCurrentThreadId());
         BOOST_ASSERT(d->mil_thread_id == thread_id);
@@ -131 +132 @@
     {
         MemoryList* current = m;
-        MemoryList* next = NULL;
         for (;;)
         {
@@ -138 +138 @@
                 break;
             }
-            next = current->next;
+            MemoryList* next = current->next;
             free2(current, current->blocks);
             current = next;
@@ -147 +147 @@
 struct ReturnMemoryProxy {
     template <typename T>
-    static void free(void* m, mil::pool::Producer& p, int blocks, typename T::isReturnMemoryEvent) {
+    static void free(void* m, mil::pool::Producer& p, int blocks, typename T::IsReturnMemoryEvent) {
         p.free2(m, T::BLOCKS);
     }
     
     template <typename T>
-    static void free(void* m, mil::pool::Producer& p, int blocks, void*) {
+    static void free(void* m, mil::pool::Producer& p, int blocks, ...) {
         p.free2(m, blocks);
     }
@@ -268 +268 @@
 {
     template <class EventData, class Target>
-    static void execute(EventData& data, Target& target, typename EventData::isReturnMemoryEvent)
+    static void execute(EventData& data, Target& target, typename EventData::IsReturnMemoryEvent)
         {
         target.tls.producer.free(data.memory);
@@ -274 +274 @@
 
     template <class EventData, class Target>
-    static void execute(EventData& data, Target& target, void*)
+    static void execute(EventData& data, Target& target, ...)
     {
         target.getChild().execute(data);
@@ -280 +280 @@
 
     template <class, class Target>
-    static void execute(ExitEvent data, Target& target, void*)
+    static void execute(ExitEvent data, Target& target, ...)
     {
         target.destroy();

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/gui-windows/GuiModule.h

@@ -100 +100 @@
             Data data;
             memcpy(&data, &event_, sizeof(data));
-            mil::ModuleExecuteProxy::execute<Data, Target>(data, target, 0);
+            mil::ModuleExecuteProxy::execute<Data, Target>(data, target, SFINAE_DUMMY_VALUE);
             if (!target.repost)
             {
@@ -114 +114 @@
 
         Event<Data>& event = *static_cast<Event<Data>*>(event_);
-        mil::ModuleExecuteProxy::execute<Data, Target>(event.data, target, 0);
+        mil::ModuleExecuteProxy::execute<Data, Target>(event.data, target, SFINAE_DUMMY_VALUE);
         if (target.repost)
         {
@@ -132 +132 @@
         hLocalWnd = hWnd_;
         hSharedWnd.store(hWnd_);
+                wndproc.set(hWnd_);
     }
 

lang/objective-cplusplus/i3/trunk/windows/mil_test.vcproj

@@ -919 +919 @@
                         </File>
                         <File
-                                RelativePath="..\src\mil\src\Test2.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\mil\src\Test3.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\mil\src\Test4.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\mil\src\Test5.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\mil\src\Test6.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\mil\src\Test7.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\mil\src\Test8.cpp"
+                                RelativePath="..\src\mil\src\Test9.cpp"
                                 >
                         </File>
@@ -958 +934 @@
                                 </FileConfiguration>
                         </File>
-                        <File
-                                RelativePath="..\src\mil\src\windows\WindowProcedureTest.cpp"
-                                >
-                        </File>
                 </Filter>
                 <Filter
@@ -977 +949 @@
                         </File>
                         <File
+                                RelativePath="..\src\mil\include\mil\Debug.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\mil\include\mil\os-windows\Debug.h"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\mil\include\mil\Debug.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\mil\include\mil\gui-windows\DummyMessageHandler-inl.h"
                                 >
@@ -997 +969 @@
                         </File>
                         <File
+                                RelativePath="..\src\mil\include\mil\GuiModule.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\mil\include\mil\gui-windows\GuiModule.h"
                                 >
                         </File>
                         <File
-                                RelativePath="..\src\mil\include\mil\GuiModule.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\mil\include\mil\gui-windows\MessageCracker-inl.h"
                                 >
@@ -1049 +1021 @@
                         </File>
                         <File
+                                RelativePath="..\src\mil\include\mil\os-windows\Thread.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\mil\include\mil\Thread.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\mil\include\mil\os-windows\Thread.h"
                                 >
                         </File>