don't place NULL pointers in the GDK window array in GTKGetWindow()

[wxWidgets.git] / interface / wx / dcmemory.h

diff --git a/interface/wx/dcmemory.h b/interface/wx/dcmemory.h
index 1becbf0cda5bb93c62ad6ca9ac2450125a9d2bd9..0d21e5bb0bc585f4a5785a4d13f67f739d1a146e 100644 (file)
--- a/interface/wx/dcmemory.h
+++ b/interface/wx/dcmemory.h
@@ -50,7 +50,7 @@ public:
     /**
         Constructs a new memory device context.
 
     /**
         Constructs a new memory device context.
 

-        Use the wxDC::Ok() member to test whether the constructor was
+        Use the wxDC::IsOk() member to test whether the constructor was

         successful in creating a usable device context. Don't forget to select
         a bitmap into the DC before drawing on it.
     */
         successful in creating a usable device context. Don't forget to select
         a bitmap into the DC before drawing on it.
     */


@@ -59,7 +59,7 @@ public:
         Constructs a new memory device context and calls SelectObject() with
         the given bitmap.
 
         Constructs a new memory device context and calls SelectObject() with
         the given bitmap.
 

-        Use the wxDC::Ok() member to test whether the constructor was
+        Use the wxDC::IsOk() member to test whether the constructor was

         successful in creating a usable device context.
     */
     wxMemoryDC(wxBitmap& bitmap);
         successful in creating a usable device context.
     */
     wxMemoryDC(wxBitmap& bitmap);


@@ -74,7 +74,7 @@ public:
         @ref overview_refcount).
 
         Also, before using the updated bitmap data, make sure to select it out
         @ref overview_refcount).
 
         Also, before using the updated bitmap data, make sure to select it out

-        of context first (for example by selecting wxNullBitmap into the device
+        of context first (for example by selecting ::wxNullBitmap into the device

         context).
 
         @see wxDC::DrawBitmap()
         context).
 
         @see wxDC::DrawBitmap()


@@ -88,7 +88,7 @@ public:
         the bitmap to a window. For this purpose, you may find wxDC::DrawIcon()
         easier to use instead.
 
         the bitmap to a window. For this purpose, you may find wxDC::DrawIcon()
         easier to use instead.
 

-        If the argument is wxNullBitmap (or some other uninitialised wxBitmap)
+        If the argument is ::wxNullBitmap (or some other uninitialised wxBitmap)

         the current bitmap is selected out of the device context, and the
         original bitmap restored, allowing the current bitmap to be destroyed
         safely.
         the current bitmap is selected out of the device context, and the
         original bitmap restored, allowing the current bitmap to be destroyed
         safely.