Changeset 30427

Show
Ignore:
Timestamp:
02/22/09 13:35:51 (4 years ago)
Author:
saturday06
Message:

core -> platform

Location:
lang/cplusplus/i3/trunk
Files:
17 modified

Legend:

Unmodified
Added
Removed

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

    r30423 r30427  
    4242src/${OS_DIR}/Os.cpp \ 
    4343src/${GUI_DIR}/Gui.cpp \ 
    44 src/${GUI_DIR}/InputWindowCore.cpp \ 
    45 src/${GUI_DIR}/CompletionWindowCore.cpp 
     44src/${GUI_DIR}/InputWindowPlatform.cpp \ 
     45src/${GUI_DIR}/CompletionWindowPlatform.cpp 
    4646 
    4747i3_SOURCES  = ${i3_SOURCES_NO_MAIN} src/Main.cpp 

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

    r18130 r30427  
    1212{ 
    1313 
    14 CompletionWindow::CompletionWindow(Mediator& mediator): CompletionWindowCore<CompletionWindow>(mediator) 
     14CompletionWindow::CompletionWindow(Mediator& mediator): CompletionWindowPlatform<CompletionWindow>(mediator) 
    1515{ 
    1616} 

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

    r26757 r30427  
    44 
    55#pragma once 
    6 #include "CompletionWindowCore.h" 
     6#include "CompletionWindowPlatform.h" 
    77 
    88namespace i3 
    … …  
    1212 
    1313class CompletionWindow : 
    14             public CompletionWindowCore<CompletionWindow> 
     14            public CompletionWindowPlatform<CompletionWindow> 
    1515{ 
    1616public: 

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

    r18130 r30427  
    77using namespace mol; 
    88 
    9 InputWindow::InputWindow(Mediator& mediator): InputWindowCore<InputWindow>(mediator) 
     9InputWindow::InputWindow(Mediator& mediator): InputWindowPlatform<InputWindow>(mediator) 
    1010{ 
    1111} 

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

    r26757 r30427  
    33#include <mol/GuiModule.h> 
    44#include "Common.h" 
    5 #include "InputWindowCore.h" 
     5#include "InputWindowPlatform.h" 
    66 
    77namespace i3 
    … …  
    1111 
    1212class InputWindow : 
    13             public InputWindowCore<InputWindow> 
     13            public InputWindowPlatform<InputWindow> 
    1414{ 
    1515public: 

  • lang/cplusplus/i3/trunk/src/gui-cocoa/CompletionWindowCore.cpp

    r20479 r30427  
    11#include <PrecompiledHeaders.h> 
    22#include "CompletionWindow.h" 
    3 #include "CompletionWindowCore.h" 
     3#include "CompletionWindowPlatform.h" 
    44#include "Mediator.h" 
    55 
    … …  
    1414 
    1515template <> 
    16 CompletionWindowCore<CompletionWindow>::CompletionWindowCore(Mediator& mediator): mediator(mediator) 
     16CompletionWindowPlatform<CompletionWindow>::CompletionWindowPlatform(Mediator& mediator): mediator(mediator) 
    1717{ 
    1818} 
    1919 
    2020template <> 
    21 CompletionWindowCore<CompletionWindow>::~CompletionWindowCore() 
     21CompletionWindowPlatform<CompletionWindow>::~CompletionWindowPlatform() 
    2222{ 
    2323} 
    2424 
    2525template <> 
    26 void CompletionWindowCore<CompletionWindow>::createUI() 
     26void CompletionWindowPlatform<CompletionWindow>::createUI() 
    2727{ 
    2828} 
    2929 
    3030template <> 
    31 void CompletionWindowCore<CompletionWindow>::run() 
     31void CompletionWindowPlatform<CompletionWindow>::run() 
    3232{ 
    3333    createUI(); 

  • lang/cplusplus/i3/trunk/src/gui-cocoa/CompletionWindowCore.h

    r27378 r30427  
    1313 
    1414template <typename Child> 
    15 class CompletionWindowCore : 
    16             public mol::GuiModule<CompletionWindowCore<Child> > 
     15class CompletionWindowPlatform : 
     16            public mol::GuiModule<CompletionWindowPlatform<Child> > 
    1717{ 
    1818public: 
    19     CompletionWindowCore(Mediator& mediator); 
    20     ~CompletionWindowCore(); 
     19    CompletionWindowPlatform(Mediator& mediator); 
     20    ~CompletionWindowPlatform(); 
    2121 
    2222    Mediator& mediator; 

  • lang/cplusplus/i3/trunk/src/gui-cocoa/InputWindowCore.cpp

    r30276 r30427  
    33#include "Gui.h" 
    44#include "Mediator.h" 
    5 #include "InputWindowCore.h" 
     5#include "InputWindowPlatform.h" 
    66#include "InputWindow.h" 
    77 
    … …  
    1212 
    1313template <> 
    14 InputWindowCore<InputWindow>::InputWindowCore(Mediator& mediator) : mediator(mediator) 
     14InputWindowPlatform<InputWindow>::InputWindowPlatform(Mediator& mediator) : mediator(mediator) 
    1515{ 
    1616} 
    1717 
    1818template <> 
    19 InputWindowCore<InputWindow>::~InputWindowCore() 
     19InputWindowPlatform<InputWindow>::~InputWindowPlatform() 
    2020{ 
    2121} 
    2222 
    2323template <> 
    24 void InputWindowCore<InputWindow>::createUI() 
     24void InputWindowPlatform<InputWindow>::createUI() 
    2525{ 
    2626    using namespace gnustep; 
    … …  
    4040 
    4141template <> 
    42 void InputWindowCore<InputWindow>::destroy() 
     42void InputWindowPlatform<InputWindow>::destroy() 
    4343{ 
    4444} 
    4545 
    4646template <> 
    47 void InputWindowCore<InputWindow>::run() 
     47void InputWindowPlatform<InputWindow>::run() 
    4848{ 
    4949    createUI(); 

  • lang/cplusplus/i3/trunk/src/gui-cocoa/InputWindowCore.h

    r27378 r30427  
    1010 
    1111template <typename Child> 
    12 class InputWindowCore : 
    13             public mol::GuiModule<InputWindowCore<Child> > 
     12class InputWindowPlatform : 
     13            public mol::GuiModule<InputWindowPlatform<Child> > 
    1414{ 
    1515public: 
    16     InputWindowCore(Mediator& mediator); 
    17     ~InputWindowCore(); 
     16    InputWindowPlatform(Mediator& mediator); 
     17    ~InputWindowPlatform(); 
    1818 
    1919    void run(); 

  • lang/cplusplus/i3/trunk/src/gui-gnustep/CompletionWindowCore.cpp

    r20479 r30427  
    11#include <PrecompiledHeaders.h> 
    22#include "CompletionWindow.h" 
    3 #include "CompletionWindowCore.h" 
     3#include "CompletionWindowPlatform.h" 
    44#include "Mediator.h" 
    55 
    … …  
    1414 
    1515template <> 
    16 CompletionWindowCore<CompletionWindow>::CompletionWindowCore(Mediator& mediator): mediator(mediator) 
     16CompletionWindowPlatform<CompletionWindow>::CompletionWindowPlatform(Mediator& mediator): mediator(mediator) 
    1717{ 
    1818} 
    1919 
    2020template <> 
    21 CompletionWindowCore<CompletionWindow>::~CompletionWindowCore() 
     21CompletionWindowPlatform<CompletionWindow>::~CompletionWindowPlatform() 
    2222{ 
    2323} 
    2424 
    2525template <> 
    26 void CompletionWindowCore<CompletionWindow>::createUI() 
     26void CompletionWindowPlatform<CompletionWindow>::createUI() 
    2727{ 
    2828} 
    2929 
    3030template <> 
    31 void CompletionWindowCore<CompletionWindow>::run() 
     31void CompletionWindowPlatform<CompletionWindow>::run() 
    3232{ 
    3333    createUI(); 

  • lang/cplusplus/i3/trunk/src/gui-gnustep/CompletionWindowCore.h

    r30283 r30427  
    1313 
    1414template <typename Child> 
    15 class CompletionWindowCore : 
    16             public mol::GuiModule<CompletionWindowCore<Child> > 
     15class CompletionWindowPlatform : 
     16            public mol::GuiModule<CompletionWindowPlatform<Child> > 
    1717{ 
    1818public: 
    19     CompletionWindowCore(Mediator& mediator); 
    20     ~CompletionWindowCore(); 
     19    CompletionWindowPlatform(Mediator& mediator); 
     20    ~CompletionWindowPlatform(); 
    2121 
    2222    Mediator& mediator; 

  • lang/cplusplus/i3/trunk/src/gui-gnustep/InputWindowCore.cpp

    r30423 r30427  
    11#include <PrecompiledHeaders.h> 
    22#include "Mediator.h" 
    3 #include "InputWindowCore.h" 
     3#include "InputWindowPlatform.h" 
    44#include "InputWindow.h" 
    55 
    … …  
    6666 
    6767template <> 
    68 InputWindowCore<InputWindow>::InputWindowCore(Mediator& mediator) : mediator(mediator) 
     68InputWindowPlatform<InputWindow>::InputWindowPlatform(Mediator& mediator) : mediator(mediator) 
    6969{ 
    7070} 
    7171 
    7272template <> 
    73 InputWindowCore<InputWindow>::~InputWindowCore() 
     73InputWindowPlatform<InputWindow>::~InputWindowPlatform() 
    7474{ 
    7575} 
    7676 
    7777template <> 
    78 void InputWindowCore<InputWindow>::createUI() 
     78void InputWindowPlatform<InputWindow>::createUI() 
    7979{ 
    8080    [NSApplication sharedApplication]; 
    … …  
    8484 
    8585template <> 
    86 void InputWindowCore<InputWindow>::destroy() 
     86void InputWindowPlatform<InputWindow>::destroy() 
    8787{ 
    8888} 
    8989 
    9090template <> 
    91 void InputWindowCore<InputWindow>::run() 
     91void InputWindowPlatform<InputWindow>::run() 
    9292{ 
    9393    createUI(); 

  • lang/cplusplus/i3/trunk/src/gui-gnustep/InputWindowCore.h

    r20479 r30427  
    99 
    1010template <typename Child> 
    11 class InputWindowCore : 
    12             public mol::GuiModule<InputWindowCore<Child> > 
     11class InputWindowPlatform : 
     12            public mol::GuiModule<InputWindowPlatform<Child> > 
    1313{ 
    1414public: 
    15     InputWindowCore(Mediator& mediator); 
    16     ~InputWindowCore(); 
     15    InputWindowPlatform(Mediator& mediator); 
     16    ~InputWindowPlatform(); 
    1717 
    1818    void run(); 

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

    r18130 r30427  
    11#include <PrecompiledHeaders.h> 
    22#include "CompletionWindow.h" 
    3 #include "CompletionWindowCore.h" 
     3#include "CompletionWindowPlatform.h" 
    44#include "Mediator.h" 
    55 
    … …  
    1414 
    1515template <> 
    16 CompletionWindowCore<CompletionWindow>::CompletionWindowCore(Mediator& mediator): mediator(mediator) 
     16CompletionWindowPlatform<CompletionWindow>::CompletionWindowPlatform(Mediator& mediator): mediator(mediator) 
    1717{ 
    1818} 
    1919 
    2020template <> 
    21 CompletionWindowCore<CompletionWindow>::~CompletionWindowCore() 
     21CompletionWindowPlatform<CompletionWindow>::~CompletionWindowPlatform() 
    2222{ 
    2323} 
    2424 
    2525template <> 
    26 void CompletionWindowCore<CompletionWindow>::createUI() 
     26void CompletionWindowPlatform<CompletionWindow>::createUI() 
    2727{ 
    2828} 
    2929 
    3030template <> 
    31 void CompletionWindowCore<CompletionWindow>::run() 
     31void CompletionWindowPlatform<CompletionWindow>::run() 
    3232{ 
    3333    createUI(); 

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

    r26757 r30427  
    1313 
    1414template <typename Child> 
    15 class CompletionWindowCore : 
    16             public mol::GuiModule<CompletionWindowCore<Child> > 
     15class CompletionWindowPlatform : 
     16            public mol::GuiModule<CompletionWindowPlatform<Child> > 
    1717{ 
    1818public: 
    19     CompletionWindowCore(Mediator& mediator); 
    20     ~CompletionWindowCore(); 
     19    CompletionWindowPlatform(Mediator& mediator); 
     20    ~CompletionWindowPlatform(); 
    2121 
    2222    Mediator& mediator; 

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

    r29658 r30427  
    11#include <PrecompiledHeaders.h> 
    22#include "Mediator.h" 
    3 #include "InputWindowCore.h" 
     3#include "InputWindowPlatform.h" 
    44#include "InputWindow.h" 
    55#include <commctrl.h> 
    … …  
    9898 
    9999template <> 
    100 InputWindowCore<InputWindow>::InputWindowCore(Mediator& mediator) :  
     100InputWindowPlatform<InputWindow>::InputWindowPlatform(Mediator& mediator) :  
    101101    mediator(mediator), 
    102102    hSharedEdit(NULL), 
    … …  
    108108 
    109109template <> 
    110 UINT InputWindowCore<InputWindow>::OnNCHitTest(HWND hwnd, int x, int y) 
     110UINT InputWindowPlatform<InputWindow>::OnNCHitTest(HWND hwnd, int x, int y) 
    111111{ 
    112112    return HTCAPTION; 
    … …  
    115115 
    116116template <> 
    117 void InputWindowCore<InputWindow>::OnLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags) 
    118 { 
    119     SetMsgHandled(false); 
    120 } 
    121  
    122 template <> 
    123 void InputWindowCore<InputWindow>::OnLButtonUp(HWND hwnd, int x, int y, UINT keyFlags) 
     117void InputWindowPlatform<InputWindow>::OnLButtonDown(HWND hwnd, BOOL fDoubleClick, int x, int y, UINT keyFlags) 
     118{ 
     119    SetMsgHandled(false); 
     120} 
     121 
     122template <> 
     123void InputWindowPlatform<InputWindow>::OnLButtonUp(HWND hwnd, int x, int y, UINT keyFlags) 
    124124{ 
    125125    SetFocus(hEdit); 
    … …  
    128128 
    129129template <> 
    130 void InputWindowCore<InputWindow>::OnActivate(HWND hwnd, UINT state, HWND hwndActDeact, BOOL fMinimized) 
     130void InputWindowPlatform<InputWindow>::OnActivate(HWND hwnd, UINT state, HWND hwndActDeact, BOOL fMinimized) 
    131131{ 
    132132    if (state == WA_INACTIVE) { 
    … …  
    138138 
    139139template <> 
    140 void InputWindowCore<InputWindow>::OnActivateApp(HWND hwnd, BOOL fActivate, DWORD dwThreadId) 
    141 { 
    142     SetMsgHandled(false); 
    143 } 
    144  
    145  
    146 template <> 
    147 void InputWindowCore<InputWindow>::OnMouseMove(HWND hwnd, int x, int y, UINT keyFlags) 
    148 { 
    149     SetMsgHandled(false); 
    150 } 
    151  
    152 template <> 
    153 InputWindowCore<InputWindow>::~InputWindowCore() 
     140void InputWindowPlatform<InputWindow>::OnActivateApp(HWND hwnd, BOOL fActivate, DWORD dwThreadId) 
     141{ 
     142    SetMsgHandled(false); 
     143} 
     144 
     145 
     146template <> 
     147void InputWindowPlatform<InputWindow>::OnMouseMove(HWND hwnd, int x, int y, UINT keyFlags) 
     148{ 
     149    SetMsgHandled(false); 
     150} 
     151 
     152template <> 
     153InputWindowPlatform<InputWindow>::~InputWindowPlatform() 
    154154{ 
    155155    using namespace std; 
    … …  
    163163 
    164164template <> 
    165 void InputWindowCore<InputWindow>::OnClose(HWND hwnd) 
     165void InputWindowPlatform<InputWindow>::OnClose(HWND hwnd) 
    166166{ 
    167167    if (hEdit && IsWindow(hEdit)) { 
    … …  
    176176 
    177177template <> 
    178 void InputWindowCore<InputWindow>::OnDestroy(HWND hwnd) 
     178void InputWindowPlatform<InputWindow>::OnDestroy(HWND hwnd) 
    179179{ 
    180180    if (IsWindow(hEdit)) { 
    … …  
    187187 
    188188template <> 
    189 void InputWindowCore<InputWindow>::OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) 
     189void InputWindowPlatform<InputWindow>::OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify) 
    190190{ 
    191191    if (hwndCtl == hEdit) 
    … …  
    206206 
    207207template <> 
    208 void InputWindowCore<InputWindow>::OnKeyDown(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags) 
     208void InputWindowPlatform<InputWindow>::OnKeyDown(HWND hwnd, UINT vk, BOOL fDown, int cRepeat, UINT flags) 
    209209{ 
    210210    if (vk == VK_ESCAPE) { 
    … …  
    214214 
    215215template <> 
    216 void InputWindowCore<InputWindow>::OnNotify(HWND hwnd, int idCtrl, LPNMHDR pnmh) { 
     216void InputWindowPlatform<InputWindow>::OnNotify(HWND hwnd, int idCtrl, LPNMHDR pnmh) { 
    217217    if (pnmh->hwndFrom != hEdit) { 
    218218        SetMsgHandled(false); 
    … …  
    243243 
    244244template <> 
    245 void InputWindowCore<InputWindow>::OnPaint(HWND hwnd) 
     245void InputWindowPlatform<InputWindow>::OnPaint(HWND hwnd) 
    246246{ 
    247247    PAINTSTRUCT ps = {}; 
    … …  
    267267 
    268268template <> 
    269 void InputWindowCore<InputWindow>::createUI() 
     269void InputWindowPlatform<InputWindow>::createUI() 
    270270{ 
    271271    if (getWindow()) { 
    … …  
    387387 
    388388template <> 
    389 void InputWindowCore<InputWindow>::run() 
     389void InputWindowPlatform<InputWindow>::run() 
    390390{ 
    391391    createUI(); 

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

    r27636 r30427  
    1111 
    1212template <typename Child = InputWindow> 
    13 class InputWindowCore : 
    14             public mol::GuiModule<InputWindowCore<Child> > 
     13class InputWindowPlatform : 
     14            public mol::GuiModule<InputWindowPlatform<Child> > 
    1515{ 
    1616public: 
    … …  
    1919        return *static_cast<Child*>(this); 
    2020    } 
    21     InputWindowCore(Mediator& mediator); 
    22     ~InputWindowCore(); 
     21    InputWindowPlatform(Mediator& mediator); 
     22    ~InputWindowPlatform(); 
    2323 
    2424    void run();