Changeset 30614

Timestamp:

02/28/09 14:52:42 (4 years ago)

Author:

saturday06

Message:

working...

Location:

lang/cplusplus/i3/trunk

Files:

• am/i3.am (modified) (1 diff)
• src/CompletionWindow.cpp (modified) (1 diff)
• src/CompletionWindow.h (modified) (1 diff)
• src/gui-gnustep/CompletionWindowPlatform.cpp (modified) (4 diffs)
• src/gui-gnustep/InputWindowPlatform.cpp (modified) (2 diffs)
• src/gui-gnustep/InputWindowPlatform.h (modified) (1 diff)
• src/mol/include/mol/gui-gnustep/GuiModule.h (modified) (2 diffs)

lang/cplusplus/i3/trunk/am/i3.am

@@ -13 +13 @@
                       -funit-at-a-time \
                       ${WARNING_OPTIONS} \
-                      -DLOCALEDIR=\"${localedir}\"
-
+                      -DLOCALEDIR=\"${localedir}\" 
+                      #-fno-rtti
 #DEFS += -DLOCALEDIR=\"${localedir}\"
 

lang/cplusplus/i3/trunk/src/CompletionWindow.cpp

@@ -20 +20 @@
 }
 
-void CompletionWindow::run()
-{
 }
-}

lang/cplusplus/i3/trunk/src/CompletionWindow.h

@@ -18 +18 @@
     ~CompletionWindow();
 
-    void run();
-
     template <typename T>
     void execute(T& event);

lang/cplusplus/i3/trunk/src/gui-gnustep/CompletionWindowPlatform.cpp

@@ -4 +4 @@
 #include "Mediator.h"
 
-/**
- *
- */
+typedef i3::CompletionWindowPlatform<i3::CompletionWindow> ParentType;
+#define WindowType CompletionWindowObjC
+#include <mol/gui-gnustep/GuiModuleObjC.h>
 
 using namespace mol;
@@ -26 +26 @@
 void CompletionWindowPlatform<CompletionWindow>::createUI()
 {
-
     NSRect rect = NSMakeRect (100, 100, 200, 200);
     unsigned int styleMask = NSTitledWindowMask 
         | NSMiniaturizableWindowMask;
 
-
-    window = [NSWindow alloc];
+    window = [[WindowType alloc] setParent: this];
     window = [window initWithContentRect: rect
                          styleMask: styleMask
@@ -38 +36 @@
                          defer: NO];
     [window setTitle: 
-     [[NSString alloc] initWithUTF8String:_("Hello Completion")]];
+     [[NSString alloc] initWithUTF8String:_("Hello compl")]];
     [window makeKeyAndOrderFront: nil];
-
 }
 
@@ -51 +48 @@
 
 }
+
+#include <mol/gui-gnustep/GuiModuleObjCImpl.h>

lang/cplusplus/i3/trunk/src/gui-gnustep/InputWindowPlatform.cpp

@@ -3 +3 @@
 #include "InputWindowPlatform.h"
 #include "InputWindow.h"
+
+typedef i3::InputWindowPlatform<i3::InputWindow> ParentType;
+#define WindowType InputWindowObjC
+#include <mol/gui-gnustep/GuiModuleObjC.h>
+
+namespace i3
+{
+using namespace mol;
+
+template <>
+InputWindowPlatform<InputWindow>::InputWindowPlatform(Mediator& mediator) : mediator(mediator)
+{
+}
+
+template <>
+InputWindowPlatform<InputWindow>::~InputWindowPlatform()
+{
+}
+
+template <>
+void InputWindowPlatform<InputWindow>::createUI()
+{
+/*
+    NSRect rect = NSMakeRect (100, 100, 200, 200);
+    unsigned int styleMask = NSTitledWindowMask 
+        | NSMiniaturizableWindowMask;
+
+    window = [[WindowType alloc] setParent: this];
+    window = [window initWithContentRect: rect
+                         styleMask: styleMask
+                         backing: NSBackingStoreBuffered
+                         defer: NO];
+    [window setTitle: 
+     [[NSString alloc] initWithUTF8String:_("Hello Input")]];
+    [window makeKeyAndOrderFront: nil];
+*/
+}
+
+template <>
+void InputWindowPlatform<InputWindow>::objctest()
+{
+    MessageBox(NULL, _T("foo"), _T("bar"), MB_OK);
+}
+
+template <>
+void InputWindowPlatform<InputWindow>::destroy()
+{
+}
+
+template <>
+void InputWindowPlatform<InputWindow>::run()
+{
+    createUI();
+    loop();
+}
+}
+
+#include <mol/gui-gnustep/GuiModuleObjCImpl.h>
+
 /*
 @interface MyDelegate : NSObject
@@ -47 +106 @@
 @end
 */
-namespace i3
-{
-using namespace mol;
 
-
-template <>
-InputWindowPlatform<InputWindow>::InputWindowPlatform(Mediator& mediator) : mediator(mediator)
-{
-}
-
-template <>
-InputWindowPlatform<InputWindow>::~InputWindowPlatform()
-{
-}
-
-template <>
-void InputWindowPlatform<InputWindow>::createUI()
-{
-    NSRect rect = NSMakeRect (100, 100, 200, 200);
-    unsigned int styleMask = NSTitledWindowMask 
-        | NSMiniaturizableWindowMask;
-
-
-    window = [NSWindow alloc];
-    window = [window initWithContentRect: rect
-                         styleMask: styleMask
-                         backing: NSBackingStoreBuffered
-                         defer: NO];
-    [window setTitle: 
-     [[NSString alloc] initWithUTF8String:_("Hello Input")]];
-    [window makeKeyAndOrderFront: nil];
-}
-
-template <>
-void InputWindowPlatform<InputWindow>::destroy()
-{
-}
-
-template <>
-void InputWindowPlatform<InputWindow>::run()
-{
-    createUI();
-    loop();
-}
-}

lang/cplusplus/i3/trunk/src/gui-gnustep/InputWindowPlatform.h

@@ -19 +19 @@
     void createUI();
     void destroy();
+    void objctest();
     Mediator& mediator;
 

lang/cplusplus/i3/trunk/src/mol/include/mol/gui-gnustep/GuiModule.h

@@ -147 +147 @@
     {
         [NSApp run];
+        return;
+/*
         while (!breakLoopRequest.load())
         {
@@ -162 +164 @@
         }
         breakLoopRequest.store(false);
+*/
     }
 };