Changeset 493 for trunk


Ignore:
Timestamp:
07/02/08 19:10:39 (11 years ago)
Author:
Eoin
Message:

Freedom from automatic ATL and/or WTL namespaces.

Location:
trunk/src
Files:
24 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/AddTorrentDialog.hpp

    r491 r493  
    1717 
    1818class AddTorrentDialog : 
    19         public CDialogImpl<AddTorrentDialog>, 
    20         public CAutoSizeWindow<AddTorrentDialog, true>, 
     19        public ATL::CDialogImpl<AddTorrentDialog>, 
     20        public ATL::CAutoSizeWindow<AddTorrentDialog, true>, 
    2121    public CWinDataExchangeEx<AddTorrentDialog>, 
    2222        private hal::IniBase<AddTorrentDialog> 
     
    2424protected: 
    2525        typedef AddTorrentDialog thisClass; 
    26         typedef CDialogImpl<thisClass> baseClass; 
    27         typedef CAutoSizeWindow<thisClass, true> autosizeClass; 
     26        typedef ATL::CDialogImpl<thisClass> baseClass; 
     27        typedef ATL::CAutoSizeWindow<thisClass, true> autosizeClass; 
    2828        typedef hal::IniBase<thisClass> iniClass; 
    2929 
  • trunk/src/AdvHaliteDialog.hpp

    r492 r493  
    2323 
    2424class AdvHaliteDialog : 
    25         public CDialogImpl<AdvHaliteDialog>, 
     25        public ATL::CDialogImpl<AdvHaliteDialog>, 
    2626        private WTL::CDialogResize<AdvHaliteDialog> 
    2727{ 
    2828protected: 
    2929        typedef AdvHaliteDialog thisClass; 
    30         typedef CDialogImpl<AdvHaliteDialog> baseClass; 
     30        typedef ATL::CDialogImpl<AdvHaliteDialog> baseClass; 
    3131        typedef WTL::CDialogResize<AdvHaliteDialog> resizeClass; 
    3232        friend class resizeClass; 
  • trunk/src/ConfigOptions.hpp

    r482 r493  
    6161#include "HaliteWindow.hpp" 
    6262#include "HaliteEditCtrl.hpp" 
     63 
    6364#include "DdxEx.hpp" 
    6465#include "CSSFileDialog.hpp" 
     66#include "AtlAutosizeDlg.h" 
    6567 
    6668class GeneralOptions : 
    6769    public WTL::CPropertyPageImpl<GeneralOptions>, 
    68         public CAutoSizeWindow<GeneralOptions, false>, 
     70        public ATL::CAutoSizeWindow<GeneralOptions, false>, 
    6971    public WTL::CWinDataExchange<GeneralOptions> 
    7072{ 
    7173        typedef GeneralOptions thisClass; 
    7274        typedef WTL::CPropertyPageImpl<thisClass> propPageClass; 
    73         typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     75        typedef ATL::CAutoSizeWindow<thisClass, false> autosizeClass; 
    7476         
    7577public: 
     
    156158class BitTorrentOptions : 
    157159    public WTL::CPropertyPageImpl<BitTorrentOptions>, 
    158         public CAutoSizeWindow<BitTorrentOptions, false>, 
     160        public ATL::CAutoSizeWindow<BitTorrentOptions, false>, 
    159161    public CWinDataExchangeEx<BitTorrentOptions> 
    160162{ 
    161163        typedef BitTorrentOptions thisClass; 
    162         typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     164        typedef ATL::CAutoSizeWindow<thisClass, false> autosizeClass; 
    163165         
    164166public: 
     
    395397class SecurityOptions : 
    396398    public WTL::CPropertyPageImpl<SecurityOptions>, 
    397         public CAutoSizeWindow<SecurityOptions, false>, 
     399        public ATL::CAutoSizeWindow<SecurityOptions, false>, 
    398400    public CWinDataExchangeEx<SecurityOptions> 
    399401{ 
    400402        typedef SecurityOptions thisClass; 
    401         typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     403        typedef ATL::CAutoSizeWindow<thisClass, false> autosizeClass; 
    402404         
    403405public: 
     
    557559class TorrentsOptions : 
    558560    public WTL::CPropertyPageImpl<TorrentsOptions>, 
    559         public CAutoSizeWindow<TorrentsOptions, false>, 
     561        public ATL::CAutoSizeWindow<TorrentsOptions, false>, 
    560562    public CWinDataExchangeEx<TorrentsOptions> 
    561563{ 
    562564        typedef TorrentsOptions thisClass; 
    563         typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     565        typedef ATL::CAutoSizeWindow<thisClass, false> autosizeClass; 
    564566public: 
    565567    enum { IDD = IDD_CONFIGTORRENT }; 
  • trunk/src/HaliteDialog.hpp

    r492 r493  
    2929class HaliteDialog : 
    3030        public ATL::CDialogImpl<HaliteDialog>, 
    31         public CAutoSizeWindow<HaliteDialog, false>, 
     31        public ATL::CAutoSizeWindow<HaliteDialog, false>, 
    3232        public CWinDataExchangeEx<HaliteDialog>, 
    3333        public CHaliteDialogBase<HaliteDialog>, 
     
    3636        typedef HaliteDialog thisClass; 
    3737        typedef ATL::CDialogImpl<thisClass> baseClass; 
    38         typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     38        typedef ATL::CAutoSizeWindow<thisClass, false> autosizeClass; 
    3939        typedef CHaliteDialogBase<thisClass> dialogBaseClass; 
    4040                 
  • trunk/src/HaliteEditCtrl.hpp

    r390 r493  
    1515template<typename T> 
    1616class CHaliteEditCtrl : 
    17         public CWindowImpl<CHaliteEditCtrl<T>, WTL::CEdit>, 
     17        public ATL::CWindowImpl<CHaliteEditCtrl<T>, WTL::CEdit>, 
    1818        private boost::noncopyable 
    1919{ 
    2020protected: 
    2121        typedef CHaliteEditCtrl<T> thisClass; 
    22         typedef CWindowImpl<thisClass, WTL::CEdit> baseClass; 
     22        typedef ATL::CWindowImpl<thisClass, WTL::CEdit> baseClass; 
    2323         
    2424public: 
     
    4444        } 
    4545         
    46         LRESULT OnChange(UINT uNotifyCode, int nID, CWindow wndCtl) 
     46        LRESULT OnChange(UINT uNotifyCode, int nID, ATL::CWindow wndCtl) 
    4747        {        
    4848                if (unapplied_) 
     
    6262        } 
    6363         
    64         LRESULT OnKillFocus(UINT uNotifyCode, int nID, CWindow wndCtl) 
     64        LRESULT OnKillFocus(UINT uNotifyCode, int nID, ATL::CWindow wndCtl) 
    6565        {        
    6666                const int buffer_size = 512; 
  • trunk/src/HaliteListViewCtrl.hpp

    r478 r493  
    1717 
    1818template <class TBase> 
    19 class CHaliteListViewCtrl : public CWindowImpl<TBase, WTL::CListViewCtrl> 
     19class CHaliteListViewCtrl : public ATL::CWindowImpl<TBase, WTL::CListViewCtrl> 
    2020{ 
    2121public: 
     
    194194        }; 
    195195         
    196         class CHaliteHeaderCtrl : public CWindowImpl<CHaliteHeaderCtrl, WTL::CHeaderCtrl> 
     196        class CHaliteHeaderCtrl : public ATL::CWindowImpl<CHaliteHeaderCtrl, WTL::CHeaderCtrl> 
    197197        { 
    198198        public: 
  • trunk/src/HaliteListViewDlg.hpp

    r491 r493  
    2323 
    2424class HaliteSaveAndMoveToDlg : 
    25         public CDialogImpl<HaliteSaveAndMoveToDlg>, 
    26         public CAutoSizeWindow<HaliteSaveAndMoveToDlg, true>, 
     25        public ATL::CDialogImpl<HaliteSaveAndMoveToDlg>, 
     26        public ATL::CAutoSizeWindow<HaliteSaveAndMoveToDlg, true>, 
    2727        public CWinDataExchangeEx<HaliteSaveAndMoveToDlg> 
    2828{ 
    2929public: 
    3030        typedef HaliteSaveAndMoveToDlg thisClass; 
    31         typedef CAutoSizeWindow<thisClass, true> autosizeClass; 
     31        typedef ATL::CAutoSizeWindow<thisClass, true> autosizeClass; 
    3232         
    3333public: 
  • trunk/src/NewTorrentDialog.hpp

    r492 r493  
    111111        public WTL::CPropertyPageImpl<DetailsSheet>, 
    112112        public CWinDataExchangeEx<DetailsSheet>, 
    113         public CAutoSizeWindow<DetailsSheet, false> 
     113        public ATL::CAutoSizeWindow<DetailsSheet, false> 
    114114{ 
    115115protected: 
    116116        typedef DetailsSheet thisClass; 
    117117        typedef WTL::CPropertyPageImpl<thisClass> sheetClass; 
    118         typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     118        typedef ATL::CAutoSizeWindow<thisClass, false> autosizeClass; 
    119119 
    120120public: 
     
    175175class FilesSheet : 
    176176        public WTL::CPropertyPageImpl<FilesSheet>, 
    177         public CAutoSizeWindow<FilesSheet, false> 
     177        public ATL::CAutoSizeWindow<FilesSheet, false> 
    178178{ 
    179179protected: 
    180180        typedef FilesSheet thisClass; 
    181181        typedef WTL::CPropertyPageImpl<thisClass> sheetClass; 
    182         typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     182        typedef ATL::CAutoSizeWindow<thisClass, false> autosizeClass; 
    183183 
    184184public:  
     
    230230class TrackerSheet : 
    231231        public WTL::CPropertyPageImpl<TrackerSheet>, 
    232         public CAutoSizeWindow<TrackerSheet, false> 
     232        public ATL::CAutoSizeWindow<TrackerSheet, false> 
    233233{ 
    234234protected: 
    235235        typedef TrackerSheet thisClass; 
    236236        typedef WTL::CPropertyPageImpl<thisClass> sheetClass; 
    237         typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     237        typedef ATL::CAutoSizeWindow<thisClass, false> autosizeClass; 
    238238 
    239239public:  
     
    273273class PeersSheet : 
    274274        public WTL::CPropertyPageImpl<PeersSheet>, 
    275         public CAutoSizeWindow<PeersSheet, false> 
     275        public ATL::CAutoSizeWindow<PeersSheet, false> 
    276276{ 
    277277protected: 
    278278        typedef PeersSheet thisClass; 
    279279        typedef WTL::CPropertyPageImpl<thisClass> sheetClass; 
    280         typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     280        typedef ATL::CAutoSizeWindow<thisClass, false> autosizeClass; 
    281281 
    282282public:  
  • trunk/src/NewTorrentPeersAD.hpp

    r492 r493  
    2525 
    2626class NewTorrent_PeersAddDialog : 
    27         public CDialogImpl<NewTorrent_PeersAddDialog>, 
     27        public ATL::CDialogImpl<NewTorrent_PeersAddDialog>, 
    2828        public WTLx::GenericAddDialog<NewTorrent_PeersAddDialog, IDD_PEEREDIT>, 
    2929        public WTL::CDialogResize<NewTorrent_PeersAddDialog>, 
  • trunk/src/NewTorrentTrackerAD.hpp

    r492 r493  
    1616 
    1717class NewTorrent_TrackerAddDialog : 
    18         public CDialogImpl<NewTorrent_TrackerAddDialog>, 
     18        public ATL::CDialogImpl<NewTorrent_TrackerAddDialog>, 
    1919        public WTLx::GenericAddDialog<NewTorrent_TrackerAddDialog, IDD_TRACKEDIT>, 
    2020        public WTL::CDialogResize<NewTorrent_TrackerAddDialog>, 
  • trunk/src/ProgressDialog.hpp

    r438 r493  
    2222 
    2323class ProgressDialog : 
    24         public CDialogImpl<ProgressDialog> 
     24        public ATL::CDialogImpl<ProgressDialog> 
    2525{ 
    2626protected: 
    2727        typedef ProgressDialog thisClass; 
    28         typedef CDialogImpl<ProgressDialog> baseClass; 
     28        typedef ATL::CDialogImpl<ProgressDialog> baseClass; 
    2929         
    3030        typedef boost::function<bool (hal::progress_callback fn)> threadFunction; 
  • trunk/src/SplashDialog.hpp

    r491 r493  
    2828 
    2929class SplashDialog : 
    30         public CDialogImpl<SplashDialog>, 
     30        public ATL::CDialogImpl<SplashDialog>, 
    3131        public hal::IniBase<SplashDialog>, 
    3232        public WTL::CWinDataExchange<SplashDialog>, 
  • trunk/src/WTLx/CSSFileDialog.hpp

    r395 r493  
    155155 
    156156                ATLASSERT(m_hWnd == NULL); 
    157                 _Module.AddCreateWndData(&m_thunk.cd, (CDialogImplBase*)this); 
     157                _Module.AddCreateWndData(&m_thunk.cd, (ATL::CDialogImplBase*)this); 
    158158 
    159159                // This is where we make our changes! If we are in Windows 2000 mode, 
  • trunk/src/WTLx/EditHilight.hpp

    r408 r493  
    4242        } 
    4343         
    44         LRESULT OnChange(UINT uNotifyCode, int nID, CWindow wndCtl) 
     44        LRESULT OnChange(UINT uNotifyCode, int nID, ATL::CWindow wndCtl) 
    4545        {        
    4646                if (unapplied_) 
  • trunk/src/WTLx/GenericAddDialog.hpp

    r491 r493  
    7575        } 
    7676 
    77         void OnCancel(UINT uNotifyCode, int nID, CWindow wndCtl) 
    78         { 
    79                 endDialog(0); 
    80         } 
    81  
    82         void OnOk(UINT uNotifyCode, int nID, CWindow wndCtl) 
     77        void OnCancel(UINT uNotifyCode, int nID, ATL::CWindow wndCtl) 
     78        { 
     79                endDialog(0); 
     80        } 
     81 
     82        void OnOk(UINT uNotifyCode, int nID, ATL::CWindow wndCtl) 
    8383        { 
    8484                endDialog(1); 
     
    191191        } 
    192192 
    193         void OnCancel(UINT uNotifyCode, int nID, CWindow wndCtl) 
    194         { 
    195                 endDialog(0); 
    196         } 
    197  
    198         void OnOk(UINT uNotifyCode, int nID, CWindow wndCtl) 
     193        void OnCancel(UINT uNotifyCode, int nID, ATL::CWindow wndCtl) 
     194        { 
     195                endDialog(0); 
     196        } 
     197 
     198        void OnOk(UINT uNotifyCode, int nID, ATL::CWindow wndCtl) 
    199199        { 
    200200                endDialog(1); 
  • trunk/src/WTLx/NTray.cpp

    r395 r493  
    460460 
    461461#ifdef _AFX 
    462   CMenu* pSubMenu = m_Menu.GetSubMenu(0); 
     462  WTL::CMenu* pSubMenu = m_Menu.GetSubMenu(0); 
    463463  ATLASSERT(pSubMenu); //Your menu resource has been designed incorrectly 
    464464 
     
    466466  pSubMenu->SetDefaultItem(m_nDefaultMenuItem, m_bDefaultMenuItemByPos); 
    467467#else 
    468   CMenuHandle subMenu = m_Menu.GetSubMenu(0); 
     468  WTL::CMenuHandle subMenu = m_Menu.GetSubMenu(0); 
    469469  ATLASSERT(subMenu.IsMenu()); //Your menu resource has been designed incorrectly 
    470470 
     
    474474} 
    475475 
    476 CMenu& CTrayNotifyIcon::GetMenu() 
     476WTL::CMenu& CTrayNotifyIcon::GetMenu() 
    477477{ 
    478478  return m_Menu; 
     
    488488  { 
    489489  #ifdef _AFX 
    490     CMenu* pSubMenu = m_Menu.GetSubMenu(0); 
     490    WTL::CMenu* pSubMenu = m_Menu.GetSubMenu(0); 
    491491    ATLASSERT(pSubMenu); //Your menu resource has been designed incorrectly 
    492492 
    493493    pSubMenu->SetDefaultItem(m_nDefaultMenuItem, m_bDefaultMenuItemByPos); 
    494494  #else 
    495     CMenuHandle subMenu = m_Menu.GetSubMenu(0); 
     495    WTL::CMenuHandle subMenu = m_Menu.GetSubMenu(0); 
    496496    ATLASSERT(subMenu.IsMenu()); //Your menu resource has been designed incorrectly 
    497497 
     
    504504BOOL CTrayNotifyIcon::Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON hIcon, UINT nNotifyMessage, UINT uMenuID) 
    505505#else 
    506 BOOL CTrayNotifyIcon::Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON hIcon, UINT nNotifyMessage, UINT uMenuID) 
     506BOOL CTrayNotifyIcon::Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON hIcon, UINT nNotifyMessage, UINT uMenuID) 
    507507#endif 
    508508{ 
     
    533533  } 
    534534#ifdef _AFX 
    535   CMenu* pSubMenu = m_Menu.GetSubMenu(0); 
     535  WTL::CMenu* pSubMenu = m_Menu.GetSubMenu(0); 
    536536  if (!pSubMenu) 
    537537  { 
     
    542542  pSubMenu->SetDefaultItem(m_nDefaultMenuItem, m_bDefaultMenuItemByPos); 
    543543#else 
    544   CMenuHandle subMenu = m_Menu.GetSubMenu(0); 
     544  WTL::CMenuHandle subMenu = m_Menu.GetSubMenu(0); 
    545545  if (!subMenu.IsMenu()) 
    546546  { 
     
    586586} 
    587587 
    588 HICON CTrayNotifyIcon::BitmapToIcon(CBitmap* pBitmap) 
     588HICON CTrayNotifyIcon::BitmapToIcon(WTL::CBitmap* pBitmap) 
    589589{ 
    590590  //Validate our parameters 
     
    601601 
    602602  //Create a mask bitmap 
    603   CBitmap maskBitmap; 
     603  WTL::CBitmap maskBitmap; 
    604604#ifdef _AFX 
    605605  BOOL bSuccess = maskBitmap.CreateBitmap(w, h, 1, 1, pMask); 
     
    629629BOOL CTrayNotifyIcon::Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID) 
    630630#else 
    631 BOOL CTrayNotifyIcon::Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID) 
     631BOOL CTrayNotifyIcon::Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, WTL::CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID) 
    632632#endif 
    633633{ 
     
    644644BOOL CTrayNotifyIcon::Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID) 
    645645#else 
    646 BOOL CTrayNotifyIcon::Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID) 
     646BOOL CTrayNotifyIcon::Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID) 
    647647#endif 
    648648{ 
     
    664664BOOL CTrayNotifyIcon::Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON hIcon, UINT nNotifyMessage, UINT uMenuID, BOOL bNoSound) 
    665665#else 
    666 BOOL CTrayNotifyIcon::Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON hIcon, UINT nNotifyMessage, UINT uMenuID, BOOL bNoSound) 
     666BOOL CTrayNotifyIcon::Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON hIcon, UINT nNotifyMessage, UINT uMenuID, BOOL bNoSound) 
    667667#endif 
    668668{ 
     
    687687  } 
    688688#ifdef _AFX 
    689   CMenu* pSubMenu = m_Menu.GetSubMenu(0); 
     689  WTL::CMenu* pSubMenu = m_Menu.GetSubMenu(0); 
    690690  if (!pSubMenu) 
    691691  { 
     
    696696  pSubMenu->SetDefaultItem(m_nDefaultMenuItem, m_bDefaultMenuItemByPos); 
    697697#else 
    698   CMenuHandle subMenu = m_Menu.GetSubMenu(0); 
     698  WTL::CMenuHandle subMenu = m_Menu.GetSubMenu(0); 
    699699  if (!subMenu.IsMenu()) 
    700700  { 
     
    773773 
    774774#ifdef _AFX 
    775 BOOL CTrayNotifyIcon::Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID, BOOL bNoSound) 
    776 #else 
    777 BOOL CTrayNotifyIcon::Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID, BOOL bNoSound) 
     775BOOL CTrayNotifyIcon::Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, WTL::CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID, BOOL bNoSound) 
     776#else 
     777BOOL CTrayNotifyIcon::Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, WTL::CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID, BOOL bNoSound) 
    778778#endif 
    779779{ 
     
    790790BOOL CTrayNotifyIcon::Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID, BOOL bNoSound) 
    791791#else 
    792 BOOL CTrayNotifyIcon::Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID, BOOL bNoSound) 
     792BOOL CTrayNotifyIcon::Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID, BOOL bNoSound) 
    793793#endif 
    794794{ 
     
    949949} 
    950950 
    951 BOOL CTrayNotifyIcon::SetIcon(CBitmap* pBitmap) 
     951BOOL CTrayNotifyIcon::SetIcon(WTL::CBitmap* pBitmap) 
    952952{ 
    953953  //Convert the bitmap to an ICON 
     
    10421042BOOL CTrayNotifyIcon::SetNotificationWnd(CWnd* pNotifyWnd) 
    10431043#else 
    1044 BOOL CTrayNotifyIcon::SetNotificationWnd(CWindow* pNotifyWnd) 
     1044BOOL CTrayNotifyIcon::SetNotificationWnd(ATL::CWindow* pNotifyWnd) 
    10451045#endif 
    10461046{ 
     
    10891089CWnd* CTrayNotifyIcon::GetNotificationWnd() const 
    10901090#else 
    1091 CWindow* CTrayNotifyIcon::GetNotificationWnd() const 
     1091ATL::CWindow* CTrayNotifyIcon::GetNotificationWnd() const 
    10921092#endif 
    10931093{ 
     
    11131113  ATLASSERT(pSubMenu); //Your menu resource has been designed incorrectly 
    11141114#else 
    1115   CMenuHandle subMenu = m_Menu.GetSubMenu(0); 
     1115  WTL::CMenuHandle subMenu = m_Menu.GetSubMenu(0); 
    11161116  ATLASSERT(subMenu.IsMenu()); 
    11171117#endif 
     
    11191119  if (lEvent == WM_RBUTTONUP) 
    11201120  { 
    1121     CPoint ptCursor; 
     1121    WTL::CPoint ptCursor; 
    11221122    GetCursorPos(&ptCursor); 
    11231123    ::SetForegroundWindow(m_NotifyIconData.hWnd); 
     
    11441144} 
    11451145 
    1146 BOOL CTrayNotifyIcon::GetDynamicDCAndBitmap(CDC* pDC, CBitmap* pBitmap) 
     1146BOOL CTrayNotifyIcon::GetDynamicDCAndBitmap(WTL::CDC* pDC, WTL::CBitmap* pBitmap) 
    11471147{ 
    11481148  //Validate our parameters 
     
    11561156    return FALSE; 
    11571157#else 
    1158   CWindow WndScreen(::GetDesktopWindow()); 
     1158  ATL::CWindow WndScreen(::GetDesktopWindow()); 
    11591159  if (!WndScreen.IsWindow()) 
    11601160    return FALSE; 
     
    11671167    return FALSE; 
    11681168#else 
    1169   CDC DCScreen(WndScreen.GetDC()); 
     1169  WTL::CDC DCScreen(WndScreen.GetDC()); 
    11701170  if (DCScreen.IsNull()) 
    11711171    return FALSE; 
  • trunk/src/WTLx/NTray.hpp

    r395 r493  
    5252//Class which handles subclassing the top level window and handles the timer 
    5353//required for tray icon animation and taskbar creation message 
    54 class CTRAYNOTIFYICON_EXT_CLASS CTrayIconHooker : public CWindowImpl<CTrayIconHooker> 
     54class CTRAYNOTIFYICON_EXT_CLASS CTrayIconHooker : public ATL::CWindowImpl<CTrayIconHooker> 
    5555{ 
    5656public: 
     
    6363  BOOL Init(CTrayNotifyIcon* pTrayIcon, CWnd* pNotifyWnd); 
    6464#else 
    65   BOOL Init(CTrayNotifyIcon* pTrayIcon, CWindow* pNotifyWnd); 
     65  BOOL Init(CTrayNotifyIcon* pTrayIcon, ATL::CWindow* pNotifyWnd); 
    6666#endif   
    6767  void StartUsingAnimation(HICON* phIcons, int nNumIcons, DWORD dwDelay); 
     
    170170  BOOL Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID = 0, BOOL bNoSound = FALSE); 
    171171#else 
    172   BOOL Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON hIcon, UINT nNotifyMessage, UINT uMenuID = 0); 
    173   BOOL Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, WTL::CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID = 0); 
    174   BOOL Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID = 0); 
    175   BOOL Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON hIcon, UINT nNotifyMessage, UINT uMenuID = 0, BOOL bNoSound = FALSE);                   
    176   BOOL Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, WTL::CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID = 0, BOOL bNoSound = FALSE); 
    177   BOOL Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID = 0, BOOL bNoSound = FALSE); 
     172  BOOL Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON hIcon, UINT nNotifyMessage, UINT uMenuID = 0); 
     173  BOOL Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, WTL::CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID = 0); 
     174  BOOL Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID = 0); 
     175  BOOL Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON hIcon, UINT nNotifyMessage, UINT uMenuID = 0, BOOL bNoSound = FALSE);                   
     176  BOOL Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, WTL::CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID = 0, BOOL bNoSound = FALSE); 
     177  BOOL Create(ATL::CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID = 0, BOOL bNoSound = FALSE); 
    178178#endif   
    179179 
     
    199199  CWnd* GetNotificationWnd() const; 
    200200#else 
    201   BOOL SetNotificationWnd(CWindow* pNotifyWnd); 
     201  BOOL SetNotificationWnd(ATL::CWindow* pNotifyWnd); 
    202202  ATL::CWindow* GetNotificationWnd() const; 
    203203#endif 
     
    250250  CWnd*            m_pNotificationWnd; 
    251251#else 
    252   CWindow*         m_pNotificationWnd; 
     252  ATL::CWindow*         m_pNotificationWnd; 
    253253#endif   
    254254  CTrayIconHooker  m_HookWnd; 
  • trunk/src/WTLx/atldlgx.h

    r392 r493  
    7373// 
    7474 
    75 typedef CWinTraits<WS_VISIBLE | WS_POPUP> CEmptyDlgTraits; 
     75typedef ATL::CWinTraits<WS_VISIBLE | WS_POPUP> CEmptyDlgTraits; 
    7676 
    7777template <UINT t_uIDS, class TDlgTraits = CEmptyDlgTraits> 
     
    926926// CInPlaceEditor : In place editing dialog 
    927927// 
    928 typedef CWinTraitsOR<ES_AUTOHSCROLL> CInPlaceEditTraits; 
     928typedef ATL::CWinTraitsOR<ES_AUTOHSCROLL> CInPlaceEditTraits; 
    929929 
    930930template < 
  • trunk/src/advtabs/Debug.hpp

    r492 r493  
    2323#include "../HaliteListViewCtrl.hpp" 
    2424 
    25 class LogEdit : public CWindowImpl<LogEdit, WTL::CEdit> 
     25class LogEdit : public ATL::CWindowImpl<LogEdit, WTL::CEdit> 
    2626{ 
    2727public: 
     
    4444}; 
    4545 
    46 class LogList : public CWindowImpl<LogList, WTL::CListBox> 
     46class LogList : public ATL::CWindowImpl<LogList, WTL::CListBox> 
    4747{ 
    4848public: 
  • trunk/src/advtabs/Files.hpp

    r492 r493  
    368368 
    369369class FileStatic : 
    370         public CWindowImpl<FileStatic, WTL::CStatic> 
     370        public ATL::CWindowImpl<FileStatic, WTL::CStatic> 
    371371{        
    372372public: 
  • trunk/src/advtabs/Torrent.hpp

    r492 r493  
    4545class AdvTorrentDialog : 
    4646        public CHalTabPageImpl<AdvTorrentDialog>, 
    47         public CAutoSizeWindow<AdvTorrentDialog, false>, 
     47        public ATL::CAutoSizeWindow<AdvTorrentDialog, false>, 
    4848        public CHaliteDialogBase<AdvTorrentDialog>, 
    4949        public CWinDataExchangeEx<AdvTorrentDialog> 
     
    5252        typedef AdvTorrentDialog thisClass; 
    5353        typedef CHalTabPageImpl<AdvTorrentDialog> baseClass; 
    54         typedef CAutoSizeWindow<AdvTorrentDialog, false> autosizeClass; 
     54        typedef ATL::CAutoSizeWindow<AdvTorrentDialog, false> autosizeClass; 
    5555        typedef CHaliteDialogBase<AdvTorrentDialog> dialogBaseClass; 
    5656 
  • trunk/src/advtabs/Tracker.hpp

    r453 r493  
    2828class AdvTrackerDialog : 
    2929        public CHalTabPageImpl<AdvTrackerDialog>, 
    30         public CAutoSizeWindow<AdvTrackerDialog, false>, 
     30        public ATL::CAutoSizeWindow<AdvTrackerDialog, false>, 
    3131        public CHaliteDialogBase<AdvTrackerDialog>, 
    3232        public CWinDataExchangeEx<AdvTrackerDialog> 
     
    3535        typedef AdvTrackerDialog thisClass; 
    3636        typedef CHalTabPageImpl<thisClass> baseClass; 
    37         typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
     37        typedef ATL::CAutoSizeWindow<thisClass, false> autosizeClass; 
    3838        typedef CHaliteDialogBase<thisClass> dialogBaseClass; 
    3939 
  • trunk/src/advtabs/TrackerAddDialog.hpp

    r492 r493  
    1818 
    1919class TrackerAddDialog : 
    20         public CDialogImpl<TrackerAddDialog>, 
     20        public ATL::CDialogImpl<TrackerAddDialog>, 
    2121        public WTLx::GenericAddDialog<TrackerAddDialog, IDD_TRACKEDIT>, 
    2222        public WTL::CDialogResize<TrackerAddDialog>, 
  • trunk/src/stdAfx.hpp

    r492 r493  
    1919#define HALITE_SENDING_CMD 68816889 
    2020 
     21#define _ATL_NO_AUTOMATIC_NAMESPACE 
    2122#define _WTL_NO_AUTOMATIC_NAMESPACE 
    2223 
Note: See TracChangeset for help on using the changeset viewer.