Ignore:
Timestamp:
Oct 19, 2011, 11:26:02 AM (14 years ago)
Author:
dmik
Message:

Replace "\" with "/" in include statements.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/gcc-kmk/src/user32/window.cpp

    r21347 r21720  
    3939#include "pmwindow.h"
    4040#include "oslibmsg.h"
    41 #include <win\winpos.h>
    42 #include <win\win.h>
     41#include <win/winpos.h>
     42#include <win/win.h>
    4343#include <heapstring.h>
    4444#include <winuser32.h>
     
    155155    }
    156156    HWND hwnd = window->getWindowHandle();
    157  
     157
    158158    // set myself as last active popup / window
    159159    window->setLastActive( hwnd );
    160  
     160
    161161    RELEASE_WNDOBJ(window);
    162162    return hwnd;
     
    262262    }
    263263    HWND hwnd = window->getWindowHandle();
    264  
     264
    265265    // set myself as last active popup / window
    266266    window->setLastActive( hwnd );
    267  
     267
    268268    RELEASE_WNDOBJ(window);
    269269    return hwnd;
     
    300300    }
    301301    hwndActive = window->SetActiveWindow();
    302  
     302
    303303    // check last active popup window
    304304    if (hwndActive)
     
    308308      dprintf(("support for last active popup incorrectly implemented"));
    309309    }
    310  
     310
    311311    RELEASE_WNDOBJ(window);
    312312    return hwndActive;
     
    561561    if ((nCmdShow == SW_RESTORE) && (window->getStyle() & WS_MINIMIZE) && fOS2Look )
    562562    {
    563         dprintf(("ShowWindow: Initiating OS/2 PM restore"));         
     563        dprintf(("ShowWindow: Initiating OS/2 PM restore"));
    564564        ret = OSLibWinRestoreWindow(window->getOS2FrameWindowHandle());
    565565    }
    566     else   
     566    else
    567567        ret = window->ShowWindow(nCmdShow);
    568568    RELEASE_WNDOBJ(window);
     
    720720    ret = TRUE;
    721721
    722     if(dwStyle & WS_CHILD) 
     722    if(dwStyle & WS_CHILD)
    723723    {
    724724        //check visibility of parents
     
    762762        //else no child -> no parent (GetParent returns owner otherwise!)
    763763    }
    764     else 
    765     if (type == GA_ROOT) 
     764    else
     765    if (type == GA_ROOT)
    766766    {
    767767         hwndAncestor = window->GetTopParent();
    768768    }
    769769    else
    770     if (type == GA_ROOTOWNER) 
    771     {
    772          if(hwnd != GetDesktopWindow()) 
     770    if (type == GA_ROOTOWNER)
     771    {
     772         if(hwnd != GetDesktopWindow())
    773773         {
    774774             hwndAncestor = hwnd;
     
    804804 TEB *teb;
    805805
    806     dprintf(("SetFocus %x", hwnd));   
     806    dprintf(("SetFocus %x", hwnd));
    807807    teb = GetThreadTEB();
    808808    if(teb == NULL) {
     
    929929    lpThreadInfo->hwndActive  = GetActiveWindow();
    930930    if(lpThreadInfo->hwndActive) {
    931         if(dwThreadId != GetWindowThreadProcessId(lpThreadInfo->hwndActive, NULL)) 
     931        if(dwThreadId != GetWindowThreadProcessId(lpThreadInfo->hwndActive, NULL))
    932932        {//this thread doesn't own the active window (TODO: correct??)
    933933            lpThreadInfo->hwndActive = 0;
     
    980980         windowDesktop->addRef();
    981981         window = windowDesktop;
    982     }     
     982    }
    983983    else window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    984      
     984
    985985    if(!window) {
    986986        dprintf(("GetWindowRect, window %x not found", hwnd));
     
    11041104 *      InternalGetWindowText    (USER32.326)
    11051105 */
    1106 int WIN32API InternalGetWindowText(HWND hwnd, 
     1106int WIN32API InternalGetWindowText(HWND hwnd,
    11071107                                   LPWSTR lpString,
    11081108                                   INT    nMaxCount )
     
    12741274        windowDesktop->addRef();
    12751275        wndfrom = windowDesktop;
    1276     } 
     1276    }
    12771277    else {
    12781278        wndfrom = Win32BaseWindow::GetWindowFromHandle(hwndFrom);
     
    12881288        windowDesktop->addRef();
    12891289        wndto = windowDesktop;
    1290     } 
     1290    }
    12911291    else {
    12921292        wndto = Win32BaseWindow::GetWindowFromHandle(hwndTo);
     
    18871887        {
    18881888//            WND *wndPtr = WIN_FindWndPtr(hwndChild);
    1889            
     1889
    18901890//            WINPOS_ShowIconTitle( wndPtr, FALSE );
    1891                
     1891
    18921892            SetWindowPos( hwndChild, 0, x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2,
    18931893                            y - yspacing - GetSystemMetrics(SM_CYICON)/2, 0, 0,
     
    20032003
    20042004  owner = Win32BaseWindow::GetWindowFromHandle(hWnd);
    2005   if(!owner) 
     2005  if(!owner)
    20062006  {
    20072007    dprintf(("GetLastActivePopup, window %x not found", hWnd));
     
    20132013  if (!IsWindow( hwndRetVal ))
    20142014    hwndRetVal = owner->getWindowHandle();
    2015  
     2015
    20162016  RELEASE_WNDOBJ(owner);
    2017  
     2017
    20182018  return hwndRetVal;
    20192019}
     
    20362036    }
    20372037    RELEASE_WNDOBJ(window);
    2038    
     2038
    20392039    return dwThreadId;
    20402040}
     
    22202220}
    22212221//******************************************************************************
    2222 //The GetWindowModuleFileName function retrieves the full path and file name of 
     2222//The GetWindowModuleFileName function retrieves the full path and file name of
    22232223//the module associated with the specified window handle.
    22242224//******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.