renamed GlobalHandle class to GlobalPtr to avoid conflict with the Win32 function

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index f21b7a5d5b492ef12e88b7e6c78b5ac00215b30a..b37696a24760e198507c9964ae4a1931979ef44f 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -399,15 +399,14 @@ private:
 };
 
 #ifdef __WATCOM__
 };
 
 #ifdef __WATCOM__

-//FIXME why does watcom dislike this ?? CE 05 April 2003

 
 // when working with global pointers (which is unfortunately still necessary
 // sometimes, e.g. for clipboard) it is important to unlock them exactly as
 // many times as we lock them which just asks for using a "smart lock" class
 
 // when working with global pointers (which is unfortunately still necessary
 // sometimes, e.g. for clipboard) it is important to unlock them exactly as
 // many times as we lock them which just asks for using a "smart lock" class

-class GlobalHandle
+class GlobalPtr

 {
 public:
 {
 public:

-    GlobalHandle(HGLOBAL hGlobal) : m_hGlobal(hGlobal)
+    GlobalPtr(HGLOBAL hGlobal) : m_hGlobal(hGlobal)

     {
         m_ptr = ::GlobalLock(hGlobal);
         if ( !m_ptr )
     {
         m_ptr = ::GlobalLock(hGlobal);
         if ( !m_ptr )


@@ -416,7 +415,7 @@ public:
         }
     }
 
         }
     }
 

-    ~GlobalHandle()
+    ~GlobalPtr()

     {
         if ( !::GlobalUnlock(m_hGlobal) )
         {
     {
         if ( !::GlobalUnlock(m_hGlobal) )
         {


@@ -437,7 +436,7 @@ private:
     HGLOBAL m_hGlobal;
     void *m_ptr;
 
     HGLOBAL m_hGlobal;
     void *m_ptr;
 

-    DECLARE_NO_COPY_CLASS(GlobalHandle)
+    DECLARE_NO_COPY_CLASS(GlobalPtr)

 };
 
 #endif //__WATCOM__
 };
 
 #endif //__WATCOM__

diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp
index ef71fc3f51ab5330f3b606ac4169d127aa2aaec1..e630937f07889503162d7c80a75f1dc7d714fdc4 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -440,7 +440,7 @@ HGLOBAL wxDIB::ConvertFromBitmap(HBITMAP hbmp)
         return NULL;
     }
 
         return NULL;
     }
 

-    if ( !ConvertFromBitmap((BITMAPINFO *)GlobalHandle(hDIB), hbmp) )
+    if ( !ConvertFromBitmap((BITMAPINFO *)GlobalPtr(hDIB), hbmp) )

     {
         // this really shouldn't happen... it worked the first time, why not
         // now?
     {
         // this really shouldn't happen... it worked the first time, why not
         // now?

diff --git a/src/msw/tbarmsw.cpp b/src/msw/tbarmsw.cpp
index 2db4053acfa7c21dbd304bf6b41ecab58dd7f029..d166b817362e8b71b8032476ad035408e9741c11 100644 (file)
--- a/src/msw/tbarmsw.cpp
+++ b/src/msw/tbarmsw.cpp
@@ -1103,7 +1103,7 @@ WXHBITMAP wxToolBar::CreateMappedBitmap(WXHINSTANCE hInstance, WXHBITMAP hBitmap
     if ( !hDIB )
         return 0;
 
     if ( !hDIB )
         return 0;
 

-    WXHBITMAP newBitmap = CreateMappedBitmap(hInstance, GlobalHandle(hDIB));
+    WXHBITMAP newBitmap = CreateMappedBitmap(hInstance, GlobalPtr(hDIB));

 
     GlobalFree(hDIB);
 
 
     GlobalFree(hDIB);