diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-08-19 05:48:44 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-08-19 05:48:44 +0400 |
commit | 47c23750e8ec7107cc4e2613b91ba2b3567e8448 (patch) | |
tree | 3f3b268684ed5e29b34bb65a18ffe21431490cba /intern | |
parent | 2060bb114a4c355b9bc9ed534709b995b86f1dce (diff) |
style cleanup: indent/whitespace
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 43 | ||||
-rw-r--r-- | intern/opencolorio/ocio_impl.cc | 2 |
2 files changed, 20 insertions, 25 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index a0ebb2c25dc..b43758b345f 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -1110,7 +1110,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, event = processWindowEvent(LOWORD(wParam) ? GHOST_kEventWindowActivate : GHOST_kEventWindowDeactivate, window); /* WARNING: Let DefWindowProc handle WM_ACTIVATE, otherwise WM_MOUSEWHEEL * will not be dispatched to OUR active window if we minimize one of OUR windows. */ - if(LOWORD(wParam)==WA_INACTIVE) + if (LOWORD(wParam)==WA_INACTIVE) window->lostMouseCapture(); lResult = ::DefWindowProc(hwnd, msg, wParam, lParam); @@ -1136,10 +1136,9 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, * function when the application obtains a WM_PAINT message by using the GetMessage or * PeekMessage function. */ - if(!window->m_inLiveResize) - { - event = processWindowEvent(GHOST_kEventWindowUpdate, window); - ::ValidateRect(hwnd, NULL); + if (!window->m_inLiveResize) { + event = processWindowEvent(GHOST_kEventWindowUpdate, window); + ::ValidateRect(hwnd, NULL); } else { eventHandled = true; @@ -1163,15 +1162,13 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, * message without calling DefWindowProc. */ /* we get first WM_SIZE before we fully init. So, do not dispatch before we continiously resizng */ - if(window->m_inLiveResize) - { - system->pushEvent(processWindowEvent(GHOST_kEventWindowSize, window)); - system->dispatchEvents(); - } - else - { - event = processWindowEvent(GHOST_kEventWindowSize, window); - } + if(window->m_inLiveResize) { + system->pushEvent(processWindowEvent(GHOST_kEventWindowSize, window)); + system->dispatchEvents(); + } + else { + event = processWindowEvent(GHOST_kEventWindowSize, window); + } break; case WM_CAPTURECHANGED: window->lostMouseCapture(); @@ -1187,16 +1184,14 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, * to perform any move or size change processing during the WM_WINDOWPOSCHANGED * message without calling DefWindowProc. */ - /* see WM_SIZE comment*/ - if(window->m_inLiveResize) - { - system->pushEvent(processWindowEvent(GHOST_kEventWindowMove, window)); - system->dispatchEvents(); - } - else - { - event = processWindowEvent(GHOST_kEventWindowMove, window); - } + /* see WM_SIZE comment*/ + if (window->m_inLiveResize) { + system->pushEvent(processWindowEvent(GHOST_kEventWindowMove, window)); + system->dispatchEvents(); + } + else { + event = processWindowEvent(GHOST_kEventWindowMove, window); + } break; //////////////////////////////////////////////////////////////////////// diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc index 05c29fd5854..9f490ea05ac 100644 --- a/intern/opencolorio/ocio_impl.cc +++ b/intern/opencolorio/ocio_impl.cc @@ -56,7 +56,7 @@ using namespace OCIO_NAMESPACE; #endif #define MEM_NEW(type) new(MEM_mallocN(sizeof(type), __func__)) type() -#define MEM_DELETE(what, type) if(what) { ((type*)(what))->~type(); MEM_freeN(what); } (void)0 +#define MEM_DELETE(what, type) if (what) { ((type*)(what))->~type(); MEM_freeN(what); } (void)0 static const int LUT3D_EDGE_SIZE = 32; |