Show
Ignore:
Timestamp:
07/02/10 22:53:11 (3 years ago)
Author:
saturday06
Message:

mdmdp

Location:
lang/objective-cplusplus/i3/trunk/src/mil
Files:
13 modified

Legend:

Unmodified
Added
Removed

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

    r37843 r37881  
    2828#endif 
    2929 
    30 #if (defined(MIL_GUI_WINDOWS) &&  defined(MIL_GUI_COCOA)) 
     30#if (defined(MIL_UI_WINDOWS) &&  defined(MIL_UI_COCOA)) 
    3131#  error 
    32 #elif !defined(MIL_GUI_WINDOWS) && !defined(MIL_GUI_COCOA) 
     32#elif !defined(MIL_UI_WINDOWS) && !defined(MIL_UI_COCOA) 
    3333#  if defined(MIL_OS_WINDOWS) 
    34 #    define MIL_GUI_WINDOWS 1 
     34#    define MIL_UI_WINDOWS 1 
    3535#  else 
    36 #    define MIL_GUI_COCOA 1 
     36#    define MIL_UI_COCOA 1 
    3737#  endif 
    3838#endif 
    3939 
    40 #if MIL_OS_WINDOWS || MIL_GUI_WINDOWS 
     40#if MIL_OS_WINDOWS || MIL_UI_WINDOWS 
    4141#  if defined(UNICODE) && !defined(_UNICODE) 
    4242#    define _UNICODE 

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

    r37879 r37881  
    44#include "ModuleCommon.h" 
    55 
    6 #ifdef MIL_GUI_WINDOWS 
    7 #include "gui-windows/UIModule.h" 
    8 #elif defined(MIL_GUI_COCOA) 
    9 #include "gui-cocoa/UIModule.h" 
     6#ifdef MIL_UI_WINDOWS 
     7#include "ui-windows/UIModule.h" 
     8#elif defined(MIL_UI_COCOA) 
     9#include "ui-cocoa/UIModule.h" 
    1010#else 
    1111#error "no GUI" 

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

    r37056 r37881  
    1515#endif 
    1616 
    17 #ifdef MIL_GUI_WINDOWS 
    18 #include "gui-windows/Gui.h" 
    19 #elif defined(MIL_GUI_COCOA) 
    20 #include "gui-cocoa/Gui.h" 
     17#ifdef MIL_UI_WINDOWS 
     18#include "ui-windows/UI.h" 
     19#elif defined(MIL_UI_COCOA) 
     20#include "ui-cocoa/UI.h" 
    2121#else 
    22 #include "gui-cocoa/Gui.h" 
     22#include "ui-cocoa/UI.h" 
    2323#endif 
    2424 

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

    r37803 r37881  
    8585public: 
    8686 
    87 #ifdef MIL_GUI_COCOA 
     87#ifdef MIL_UI_COCOA 
    8888    void setWindow(NSWindow*) { 
    8989    } 

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

    r37316 r37881  
    3636class Tls { 
    3737    struct Data { 
    38 #ifdef MIL_GUI_WINDOWS 
     38#ifdef MIL_UI_WINDOWS 
    3939        HWND window_cache; 
    4040#else 

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

    r37843 r37881  
    3636#endif 
    3737 
    38 #ifdef MIL_GUI_COCOA 
     38#ifdef MIL_UI_COCOA 
    3939 
    4040#ifdef __APPLE__ 
    … …  
    6464#import <AppKit/AppKit.h> 
    6565 
    66 #include "gui-cocoa/PrecompiledHeaders.h" 
     66#include "ui-cocoa/PrecompiledHeaders.h" 
    6767 
    6868//#define Object MIL_REPLACE_Object 
    … …  
    7171 
    7272#else 
    73 #include "gui-windows/PrecompiledHeaders.h" 
     73#include "ui-windows/PrecompiledHeaders.h" 
    7474#endif 
    7575 

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

    r37121 r37881  
    2121} 
    2222 
    23 #ifdef MIL_GUI_COCOA 
     23#ifdef MIL_UI_COCOA 
    2424#define MIL_DEFAULT_THREAD thread::Cocoa 
    2525#elif defined(MIL_OS_UNIX) 
    2626#define MIL_DEFAULT_THREAD thread::Posix 
    27 #elif defined(MIL_GUI_WINDOWS) 
     27#elif defined(MIL_UI_WINDOWS) 
    2828#define MIL_DEFAULT_THREAD thread::Windows 
    2929#else 

  • lang/objective-cplusplus/i3/trunk/src/mil/include/mil/ui-cocoa/GuiModule.h

    r37879 r37881  
    5050    } 
    5151 
    52     void createGui() { 
     52    void createUI() { 
    5353    } 
    5454 

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

    r37879 r37881  
    197197    } 
    198198 
    199     void createGUI() { // XXX UI or Gui 
     199    void createGUI() { // XXX UI or UI 
    200200    } 
    201201 

  • lang/objective-cplusplus/i3/trunk/src/mil/src/test/Main.cc

    r37761 r37881  
    1212int start(int argc, char** argv) { 
    1313 
    14 #ifdef MIL_GUI_COCOA 
     14#ifdef MIL_UI_COCOA 
    1515    [NSApplication sharedApplication]; 
    1616#endif 

  • lang/objective-cplusplus/i3/trunk/src/mil/src/test/Module.cc

    r37879 r37881  
    175175    } 
    176176 
    177     void createGui() { 
     177    void createUI() { 
    178178        this->setWindow(create_window()); 
    179179    } 
    … …  
    258258struct FooSingleThreadedUIModule : public FooUIModule { 
    259259    FooSingleThreadedUIModule() { 
    260         createGui(); 
     260        createUI(); 
    261261    } 
    262262}; 
    … …  
    941941 
    942942struct Foo : UIModule<Foo> { 
    943     void createGui() { 
     943    void createUI() { 
    944944        this->setWindow(create_window()); 
    945945    } 
    … …  
    10121012 
    10131013struct Hoge : UIModule<Hoge> { 
    1014     void createGui() { 
     1014    void createUI() { 
    10151015        this->setWindow(create_window()); 
    10161016        while (spin.load()) {} 

  • lang/objective-cplusplus/i3/trunk/src/mil/src/test/Test.h

    r37879 r37881  
    1414namespace test { 
    1515 
    16 #if !defined(MIL_GUI_WINDOWS) && !defined(MIL_OS_WINDOWS) 
     16#if !defined(MIL_UI_WINDOWS) && !defined(MIL_OS_WINDOWS) 
    1717static inline void Sleep(int milliseconds) { 
    1818    timespec req = {}; 
    … …  
    2222#endif 
    2323 
    24 #ifdef MIL_GUI_WINDOWS 
     24#ifdef MIL_UI_WINDOWS 
    2525static inline HWND create_window() { 
    2626    TCHAR ClassName[] = _T("testtest"); //  <- rule required 

  • lang/objective-cplusplus/i3/trunk/src/mil/src/windows/WindowProcedureTest.cc

    r37304 r37881  
    22#include <quicktest/quicktest.h> 
    33 
    4 // #include "../../include/mil/gui-windows/WindowProcedureRedirector.h" 
     4// #include "../../include/mil/ui-windows/WindowProcedureRedirector.h" 
    55// #include <assert.h> 
    66