Show
Ignore:
Timestamp:
08/19/09 08:00:06 (4 years ago)
Author:
saturday06
Message:

iiiiiiiiiiiii

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

Legend:

Unmodified
Added
Removed

  • lang/objective-cplusplus/i3/trunk/src/CompletionWindow.cpp

    r34447 r34909  
    1111namespace i3 { 
    1212 
    13 CompletionWindow::CompletionWindow(Mediator& mediator): CompletionWindowPlatform<CompletionWindow>(mediator) { 
     13CompletionWindow::CompletionWindow(Mediator& mediator): mediator(mediator) { 
    1414} 
    1515 

  • lang/objective-cplusplus/i3/trunk/src/CompletionWindow.h

    r34863 r34909  
    1313            public CompletionWindowPlatform<CompletionWindow> { 
    1414public: 
     15    Mediator& mediator; 
     16 
    1517    CompletionWindow(Mediator& mediator); 
    1618    ~CompletionWindow(); 

  • lang/objective-cplusplus/i3/trunk/src/InputWindow.cpp

    r34863 r34909  
    66using namespace mil; 
    77 
    8 InputWindow::InputWindow(Mediator& mediator): InputWindowPlatform<InputWindow>(mediator) { 
     8InputWindow::InputWindow(Mediator& mediator): mediator(mediator) { 
    99    local_input_cache.reserve(2345); 
    1010    input_cache.write(local_input_cache); 
    … …  
    1414} 
    1515 
    16 void InputWindow::run() { 
    17     createGui(); 
    18     loop(); 
    19  
    20     ExitEvent e; 
    21     mediator.getCompletionWindow().post(e, *this); 
    22     mediator.getOutputWindow().post(e, *this); 
    23     mediator.getDelegate().post(e, *this); 
    24 } 
    2516 
    2617} 

  • lang/objective-cplusplus/i3/trunk/src/InputWindow.h

    r34863 r34909  
    1212class InputWindow : public InputWindowPlatform<InputWindow> { 
    1313public: 
     14    Mediator& mediator; 
     15 
    1416    InputWindow(Mediator& mediator); 
    1517    ~InputWindow(); 

  • lang/objective-cplusplus/i3/trunk/src/OutputWindow.h

    r34863 r34909  
    1313class OutputWindow : public mil::GuiModule<OutputWindow> { 
    1414public: 
     15    Mediator& mediator; 
     16 
    1517    OutputWindow(Mediator& mediator); 
    1618    ~OutputWindow(); 

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

    r34447 r34909  
    1313 
    1414template <> 
    15 CompletionWindowPlatform<CompletionWindow>::CompletionWindowPlatform(Mediator& mediator): mediator(mediator) { 
     15CompletionWindowPlatform<CompletionWindow>::CompletionWindowPlatform() { 
    1616} 
    1717 

  • lang/objective-cplusplus/i3/trunk/src/gui-windows/CompletionWindowPlatform.h

    r34447 r34909  
    1515            public mil::GuiModule<CompletionWindowPlatform<Child> > { 
    1616public: 
    17     CompletionWindowPlatform(Mediator& mediator); 
     17    CompletionWindowPlatform(); 
    1818    ~CompletionWindowPlatform(); 
    1919 
    20     Mediator& mediator; 
    2120    void run(); 
    2221    void createUI(); 

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

    r34863 r34909  
    8181    ///int result = GetWindowText(e.hEdit, data, _countof(data)); 
    8282    std::vector<TCHAR> data; 
    83     mediator.getInputWindow().input_cache.read(data); 
     83    getChild().mediator.getInputWindow().input_cache.read(data); 
    8484     
    8585    if (data[0]) { 
    … …  
    9494 
    9595    BOOST_STATIC_ASSERT(sizeof(HICON) == sizeof(DWORD_PTR)); 
    96     HICON old = mediator.getInputWindow().hSharedIcon.exchange(new_icon); 
     96    HICON old = getChild().mediator.getInputWindow().hSharedIcon.exchange(new_icon); 
    9797    if (old) { 
    9898        DestroyIcon(old); 
    9999    } 
    100     HWND hWnd = mediator.getInputWindow().getWindow(); 
     100    HWND hWnd = getChild().mediator.getInputWindow().getWindow(); 
    101101    RECT r = {0, 0, 20, 20}; 
    102102    InvalidateRect(hWnd, &r, TRUE); 
    … …  
    105105 
    106106template <> 
    107 InputWindowPlatform<InputWindow>::InputWindowPlatform(Mediator& mediator) : 
    108         mediator(mediator), 
     107InputWindowPlatform<InputWindow>::InputWindowPlatform() : 
    109108        //hSharedEdit(NULL), 
    110109        hSharedIcon(NULL), 
    … …  
    337336             
    338337            EditChangedEvent e = {}; 
    339             mediator.getDelegate().post(e, *this); 
     338            getChild().mediator.getDelegate().post(e, *this); 
    340339        } 
    341340        break; 
    … …  
    368367            } else if (filter->wParam == VK_RETURN) { 
    369368                ExecuteEvent e; 
    370                 mediator.getDelegate().post(e, *this); 
     369                getChild().mediator.getDelegate().post(e, *this); 
    371370            } 
    372371        } 

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

    r34863 r34909  
    1414public: 
    1515    MIL_CRTP_CLASS_MEMBERS; 
    16     InputWindowPlatform(Mediator& mediator); 
     16    InputWindowPlatform(); 
    1717    ~InputWindowPlatform(); 
    18     Mediator& mediator; 
    1918 
    2019    void createGui();