test that iterator is valid before comparing with it (another bug introduced when...

[wxWidgets.git] / interface / statbmp.h

diff --git a/interface/statbmp.h b/interface/statbmp.h
index 635bd3516b7982ba3a1282c6ce883b826cc8131e..90d67b147daf7241628c6b407825829f0321ee27 100644 (file)
--- a/interface/statbmp.h
+++ b/interface/statbmp.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.h

-// Purpose:     documentation for wxStaticBitmap class
+// Purpose:     interface of wxStaticBitmap

 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Licence:     wxWindows license


@@ -20,8 +20,7 @@
     @category{ctrl}
     @appearance{staticbitmap.png}
 
     @category{ctrl}
     @appearance{staticbitmap.png}
 

-    @seealso
-    wxStaticBitmap, wxStaticBox
+    @see wxStaticBitmap, wxStaticBox

 */
 class wxStaticBitmap : public wxControl
 {
 */
 class wxStaticBitmap : public wxControl
 {


@@ -29,7 +28,7 @@ public:
     //@{
     /**
         Constructor, creating and showing a static bitmap control.
     //@{
     /**
         Constructor, creating and showing a static bitmap control.

-        
+

         @param parent
             Parent window. Should not be @NULL.
         @param id
         @param parent
             Parent window. Should not be @NULL.
         @param id


@@ -44,7 +43,7 @@ public:
             Window style. See wxStaticBitmap.
         @param name
             Window name.
             Window style. See wxStaticBitmap.
         @param name
             Window name.

-        
+

         @see Create()
     */
     wxStaticBitmap();
         @see Create()
     */
     wxStaticBitmap();


@@ -69,7 +68,7 @@ public:
     /**
         Returns the bitmap currently used in the control. Notice that this method can
         be called even if SetIcon() had been used.
     /**
         Returns the bitmap currently used in the control. Notice that this method can
         be called even if SetIcon() had been used.

-        
+

         @see SetBitmap()
     */
     wxBitmap GetBitmap() const;
         @see SetBitmap()
     */
     wxBitmap GetBitmap() const;


@@ -79,26 +78,27 @@ public:
         only be called if SetIcon() had been used: an icon
         can't be retrieved from the control if a bitmap had been set (using
         wxStaticBitmap::SetBitmap).
         only be called if SetIcon() had been used: an icon
         can't be retrieved from the control if a bitmap had been set (using
         wxStaticBitmap::SetBitmap).

-        
+

         @see SetIcon()
     */
     wxIcon GetIcon() const;
 
     /**
         Sets the bitmap label.
         @see SetIcon()
     */
     wxIcon GetIcon() const;
 
     /**
         Sets the bitmap label.

-        
+

         @param label
             The new bitmap.
         @param label
             The new bitmap.

-        
+

         @see GetBitmap()
     */
     virtual void SetBitmap(const wxBitmap& label);
 
     /**
         Sets the label to the given icon.
         @see GetBitmap()
     */
     virtual void SetBitmap(const wxBitmap& label);
 
     /**
         Sets the label to the given icon.

-        
+

         @param label
             The new icon.
     */
     virtual void SetIcon(const wxIcon& label);
 };
         @param label
             The new icon.
     */
     virtual void SetIcon(const wxIcon& label);
 };

+