Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/rawbmp.h b/interface/wx/rawbmp.h
index df9ac8456756df00b031b9c74124a8bb05b6202d..50d3656b9cb9fed7e1bed5735711de5fe8ca779e 100644 (file)
--- a/interface/wx/rawbmp.h
+++ b/interface/wx/rawbmp.h
@@ -3,12 +3,11 @@
 // Purpose:     interface of wxPixelData
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxPixelData
-    @wxheader{rawbmp.h}
 
     A class template with ready to use implementations for getting
     direct and efficient access to wxBitmap's internal data and
@@ -95,12 +94,12 @@ public:
         Create pixel data object representing the area of the image defined by
         @a pt and @a sz.
     */
-    wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz)
+    wxPixelData(Image& i, const wxPoint& pt, const wxSize& sz);
 
     /**
         Return @true of if we could get access to bitmap data successfully.
     */
-    operator bool() const:
+    operator bool() const;
 
     /**
         Return the iterator pointing to the origin of the image.
@@ -203,7 +202,7 @@ public:
 
         //@{
         /**
-            Data Access: Access to invidividual colour components.
+            Data Access: Access to individual colour components.
         */
         ChannelType& Red();
         ChannelType& Green();