Changeset 390 for trunk


Ignore:
Timestamp:
03/04/08 17:17:18 (12 years ago)
Author:
Eoin
Message:

Adding some WTL:: namespace prefixes.

Location:
trunk/src
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/AtlAutosizeDlg.h

    r333 r390  
    7171 */ 
    7272#define TRANSPARENT_LIST(theClass, ...) \ 
    73         BOOL HandleTransparentMap(CDCHandle dc = NULL) \ 
     73        BOOL HandleTransparentMap(WTL::CDCHandle dc = NULL) \ 
    7474        { \ 
    7575                int tcCtrls[] = {0, __VA_ARGS__, INT_MAX}; \ 
     
    728728 
    729729                if(wParam != NULL) { 
    730                         CDCHandle dc = (HDC)wParam; 
     730                        WTL::CDCHandle dc = (HDC)wParam; 
    731731                        dc.SetViewportOrg(-pt.x, -pt.y); 
    732732                        pT->DoPaint(dc); 
    733733                } else { 
    734                         CPaintDC dc(pT->m_hWnd); 
     734                        WTL::CPaintDC dc(pT->m_hWnd); 
    735735                        dc.SetViewportOrg(-pt.x, -pt.y); 
    736736                        pT->DoPaint(dc.m_hDC); 
     
    904904        /** \param dc The hDC to paint to 
    905905         */ 
    906         void DoPaint(CDCHandle dc) 
     906        void DoPaint(WTL::CDCHandle dc) 
    907907        { 
    908908                T* pT = static_cast<T*>(this); 
     
    22382238        } 
    22392239 
    2240         BOOL DrawTransparentCtrl(CDCHandle dc, int iCtrl) 
     2240        BOOL DrawTransparentCtrl(WTL::CDCHandle dc, int iCtrl) 
    22412241        { 
    22422242                T* pT = static_cast<T*>(this); 
  • trunk/src/CSSFileDialog.hpp

    r368 r390  
    8080#endif // UNICODE 
    8181 
    82 class CSSFileDialog : public CFileDialogImpl<CSSFileDialog> 
     82class CSSFileDialog : public WTL::CFileDialogImpl<CSSFileDialog> 
    8383{ 
    8484public: 
  • trunk/src/ConfigOptions.hpp

    r380 r390  
    6161 
    6262class GeneralOptions : 
    63     public CPropertyPageImpl<GeneralOptions>, 
     63    public WTL::CPropertyPageImpl<GeneralOptions>, 
    6464        public CAutoSizeWindow<GeneralOptions, false>, 
    65     public CWinDataExchange<GeneralOptions> 
     65    public WTL::CWinDataExchange<GeneralOptions> 
    6666{ 
    6767        typedef GeneralOptions thisClass; 
    68         typedef CPropertyPageImpl propPageClass; 
     68        typedef WTL::CPropertyPageImpl<thisClass> propPageClass; 
    6969        typedef CAutoSizeWindow<thisClass, false> autosizeClass; 
    7070         
     
    145145 
    146146private: 
    147         CListBox lang_list_; 
     147        WTL::CListBox lang_list_; 
    148148        std::map<wstring, wpath> lang_map_; 
    149149        HaliteWindow* haliteWindow_; 
     
    151151 
    152152class BitTorrentOptions : 
    153     public CPropertyPageImpl<BitTorrentOptions>, 
     153    public WTL::CPropertyPageImpl<BitTorrentOptions>, 
    154154        public CAutoSizeWindow<BitTorrentOptions, false>, 
    155155    public CWinDataExchangeEx<BitTorrentOptions> 
     
    299299        } 
    300300private: 
    301         CHyperLink helpLink; 
    302         CHyperLink whyHalfConn; 
     301        WTL::CHyperLink helpLink; 
     302        WTL::CHyperLink whyHalfConn; 
    303303}; 
    304304 
    305305class ProxyOptions : 
    306     public CPropertyPageImpl<ProxyOptions>, 
     306    public WTL::CPropertyPageImpl<ProxyOptions>, 
    307307    public CWinDataExchangeEx<ProxyOptions> 
    308308{ 
     
    390390 
    391391class SecurityOptions : 
    392     public CPropertyPageImpl<SecurityOptions>, 
     392    public WTL::CPropertyPageImpl<SecurityOptions>, 
    393393        public CAutoSizeWindow<SecurityOptions, false>, 
    394394    public CWinDataExchangeEx<SecurityOptions> 
     
    548548 
    549549private: 
    550         CHyperLink helpLink; 
     550        WTL::CHyperLink helpLink; 
    551551}; 
    552552 
    553553class TorrentsOptions : 
    554     public CPropertyPageImpl<TorrentsOptions>, 
     554    public WTL::CPropertyPageImpl<TorrentsOptions>, 
    555555        public CAutoSizeWindow<TorrentsOptions, false>, 
    556556    public CWinDataExchangeEx<TorrentsOptions> 
     
    661661                wstring folderSelect = hal::app().res_wstr(HAL_FOLDER_SELECT); 
    662662 
    663                 CFolderDialog fldDlg (NULL, folderSelect.c_str(), 
     663                WTL::CFolderDialog fldDlg (NULL, folderSelect.c_str(), 
    664664                        BIF_RETURNONLYFSDIRS|BIF_NEWDIALOGSTYLE); 
    665665 
     
    699699 
    700700class RemoteOptions : 
    701     public CPropertyPageImpl<RemoteOptions>, 
    702     public CWinDataExchange<RemoteOptions> 
     701    public WTL::CPropertyPageImpl<RemoteOptions>, 
     702    public WTL::CWinDataExchange<RemoteOptions> 
    703703{ 
    704704public: 
     
    736736 
    737737class AboutOptions : 
    738     public CPropertyPageImpl<AboutOptions>, 
    739         public CDialogResize<AboutOptions> 
     738    public WTL::CPropertyPageImpl<AboutOptions>, 
     739        public WTL::CDialogResize<AboutOptions> 
    740740{ 
    741741        typedef AboutOptions thisClass; 
    742         typedef CDialogResize<thisClass> resizeClass; 
     742        typedef WTL::CDialogResize<thisClass> resizeClass; 
    743743 
    744744public: 
     
    776776private: 
    777777 
    778         CRichEditCtrl richEdit_; 
     778        WTL::CRichEditCtrl richEdit_; 
    779779        RECT richRect_; 
    780780}; 
    781781 
    782782class ConfigOptionsProp : 
    783         public CPropertySheet, 
    784         public CDialogResize<ConfigOptionsProp> 
     783        public WTL::CPropertySheet, 
     784        public WTL::CDialogResize<ConfigOptionsProp> 
    785785{ 
    786786        typedef ConfigOptionsProp thisClass; 
    787         typedef CDialogResize<thisClass> resizeClass; 
     787        typedef WTL::CDialogResize<thisClass> resizeClass; 
    788788 
    789789public: 
     
    817817        END_DLGRESIZE_MAP() 
    818818 
    819         void OnSize(UINT, CSize) 
     819        void OnSize(UINT, WTL::CSize) 
    820820        { 
    821821        SetMsgHandled(false); 
     
    837837        if (wParam == TRUE) 
    838838        { 
    839             CMenuHandle pSysMenu = GetSystemMenu(FALSE); 
     839            WTL::CMenuHandle pSysMenu = GetSystemMenu(FALSE); 
    840840 
    841841                if (pSysMenu != NULL) 
  • trunk/src/DdxEx.hpp

    r326 r390  
    4646                         
    4747template <class T> 
    48 class CWinDataExchangeEx : public CWinDataExchange<T> 
     48class CWinDataExchangeEx : public WTL::CWinDataExchange<T> 
    4949{ 
    5050public:  
  • trunk/src/HaliteEditCtrl.hpp

    r375 r390  
    1515template<typename T> 
    1616class CHaliteEditCtrl : 
    17         public CWindowImpl<CHaliteEditCtrl<T>, CEdit>, 
     17        public CWindowImpl<CHaliteEditCtrl<T>, WTL::CEdit>, 
    1818        private boost::noncopyable 
    1919{ 
    2020protected: 
    2121        typedef CHaliteEditCtrl<T> thisClass; 
    22         typedef CWindowImpl<thisClass, CEdit> baseClass; 
     22        typedef CWindowImpl<thisClass, WTL::CEdit> baseClass; 
    2323         
    2424public: 
     
    9898        } 
    9999         
    100         HBRUSH OnReflectedCtlColorEdit(CDCHandle dc, CEdit edit) 
     100        HBRUSH OnReflectedCtlColorEdit(WTL::CDCHandle dc, WTL::CEdit edit) 
    101101        { 
    102102                if (signal_ && unapplied_) 
  • trunk/src/HaliteListViewCtrl.hpp

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

    r377 r390  
    4646template <class TBase, typename adapterType=void*, size_t N=-1> 
    4747class CHaliteSortListViewCtrl :  
    48         public CSortListViewCtrlImpl<CHaliteSortListViewCtrl<TBase, adapterType, N> > 
     48        public WTL::CSortListViewCtrlImpl<CHaliteSortListViewCtrl<TBase, adapterType, N> > 
    4949{ 
    5050public: 
     
    263263        }; 
    264264         
    265         class CHaliteHeaderCtrl : public CWindowImpl<CHaliteHeaderCtrl, CHeaderCtrl> 
     265        class CHaliteHeaderCtrl : public CWindowImpl<CHaliteHeaderCtrl, WTL::CHeaderCtrl> 
    266266        { 
    267267        public: 
  • trunk/src/HaliteWindow.hpp

    r383 r390  
    4040 
    4141class HaliteWindow : 
    42         public CFrameWindowImpl<HaliteWindow>, 
    43         public CUpdateUI<HaliteWindow>, 
     42        public WTL::CFrameWindowImpl<HaliteWindow>, 
     43        public WTL::CUpdateUI<HaliteWindow>, 
    4444        public CDropFileTarget<HaliteWindow>, 
    45         public CMessageFilter, 
    46         public CIdleHandler, 
     45        public WTL::CMessageFilter, 
     46        public WTL::CIdleHandler, 
    4747        public hal::IniBase<HaliteWindow>, 
    4848        private boost::noncopyable 
     
    150150        void OnClose(); 
    151151        void OnDestroy(); 
    152         void OnSize(UINT, CSize); 
    153         void OnMove(CSize); 
     152        void OnSize(UINT, WTL::CSize); 
     153        void OnMove(WTL::CSize); 
    154154        void OnShowWindow(BOOL bShow, UINT nStatus); 
    155155        LRESULT OnTrayNotification(UINT, WPARAM wParam, LPARAM lParam); 
     
    196196        boost::signal<void ()> save_state_signal_;       
    197197         
    198         CCommandBarCtrl m_CmdBar; 
    199         CHorSplitterWindow m_Split; 
    200     CMultiPaneStatusBarCtrl m_StatusBar; 
     198        WTL::CCommandBarCtrl m_CmdBar; 
     199        WTL::CHorSplitterWindow m_Split; 
     200    WTL::CMultiPaneStatusBarCtrl m_StatusBar; 
    201201        CTrayNotifyIcon trayIcon_; 
    202202 
     
    212212        unsigned WM_AreYouMe_; 
    213213 
    214         CRect rect; 
     214        WTL::CRect rect; 
    215215        unsigned int splitterPos; 
    216216        bool use_tray; 
  • trunk/src/NTray.hpp

    r88 r390  
    164164#ifdef _AFX 
    165165  BOOL Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON hIcon, UINT nNotifyMessage, UINT uMenuID = 0); 
    166   BOOL Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID = 0); 
     166  BOOL Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, WTL::CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID = 0); 
    167167  BOOL Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID = 0); 
    168168  BOOL Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, HICON hIcon, UINT nNotifyMessage, UINT uMenuID = 0, BOOL bNoSound = FALSE);                   
    169   BOOL Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID = 0, BOOL bNoSound = FALSE); 
     169  BOOL Create(CWnd* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, LPCTSTR pszBalloonText, LPCTSTR pszBalloonCaption, UINT nTimeout, BalloonStyle style, WTL::CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID = 0, BOOL bNoSound = FALSE); 
    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 
    172172  BOOL Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON hIcon, UINT nNotifyMessage, UINT uMenuID = 0); 
    173   BOOL Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID = 0); 
     173  BOOL Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, WTL::CBitmap* pBitmap, UINT nNotifyMessage, UINT uMenuID = 0); 
    174174  BOOL Create(CWindow* pNotifyWnd, UINT uID, LPCTSTR pszTooltipText, HICON* phIcons, int nNumIcons, DWORD dwDelay, UINT nNotifyMessage, UINT uMenuID = 0); 
    175175  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, CBitmap* pBitmap, 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); 
    177177  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); 
    178178#endif   
     
    185185//Sets or gets the icon displayed 
    186186  BOOL SetIcon(HICON hIcon); 
    187   BOOL SetIcon(CBitmap* pBitmap); 
     187  BOOL SetIcon(WTL::CBitmap* pBitmap); 
    188188  BOOL SetIcon(LPCTSTR lpIconName); 
    189189  BOOL SetIcon(UINT nIDResource); 
     
    200200#else 
    201201  BOOL SetNotificationWnd(CWindow* pNotifyWnd); 
    202   CWindow* GetNotificationWnd() const; 
     202  ATL::CWindow* GetNotificationWnd() const; 
    203203#endif 
    204204 
     
    210210 
    211211//Dynamic tray icon support 
    212   HICON BitmapToIcon(CBitmap* pBitmap); 
    213   static BOOL GetDynamicDCAndBitmap(CDC* pDC, CBitmap* pBitmap); 
     212  HICON BitmapToIcon(WTL::CBitmap* pBitmap); 
     213  static BOOL GetDynamicDCAndBitmap(WTL::CDC* pDC, WTL::CBitmap* pBitmap); 
    214214 
    215215//Modification of the menu to use as the context menu 
    216216  void SetMenu(HMENU hMenu); 
    217   CMenu& GetMenu(); 
     217  WTL::CMenu& GetMenu(); 
    218218  void SetDefaultMenuItem(UINT uItem, BOOL fByPos); 
    219219  void GetDefaultMenuItem(UINT& uItem, BOOL& fByPos) { uItem = m_nDefaultMenuItem; fByPos = m_bDefaultMenuItemByPos; }; 
     
    253253#endif   
    254254  CTrayIconHooker  m_HookWnd; 
    255   CMenu            m_Menu; 
     255  WTL::CMenu       m_Menu; 
    256256  UINT             m_nDefaultMenuItem; 
    257257  BOOL             m_bDefaultMenuItemByPos; 
  • trunk/src/ProgressDialog.hpp

    r348 r390  
    8282        wstring windowText_; 
    8383        bool stop_; 
    84         CProgressBarCtrl prog_; 
     84        WTL::CProgressBarCtrl prog_; 
    8585}; 
    8686 
  • trunk/src/stdAfx.hpp

    r389 r390  
    1919#define HALITE_SENDING_CMD 68816889 
    2020 
     21//      #define _WTL_NO_AUTOMATIC_NAMESPACE 
     22 
    2123#include <winsock2.h> 
    2224#include <shellapi.h> 
     
    2426#include <atlapp.h> 
    2527 
    26 extern CAppModule _Module; 
     28extern WTL::CAppModule _Module; 
    2729#define _ATL_USE_DDX_FLOAT 
    2830 
     
    107109 
    108110template<class Archive> 
    109 void serialize(Archive& ar, CRect& rect, const unsigned int version) 
     111void serialize(Archive& ar, WTL::CRect& rect, const unsigned int version) 
    110112{ 
    111113        ar & BOOST_SERIALIZATION_NVP(rect.top); 
Note: See TracChangeset for help on using the changeset viewer.