Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/statbmp.h b/interface/wx/statbmp.h
index dbefc3b5236865193ef14cc4846c4e57d8ac318f..213dafb8267d6ffe4690b361a12254906ef80ce7 100644 (file)
--- a/interface/wx/statbmp.h
+++ b/interface/wx/statbmp.h
@@ -3,22 +3,23 @@
 // Purpose:     interface of wxStaticBitmap
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
     @class wxStaticBitmap
 
-    A static bitmap control displays a bitmap. Native implementations on some 
-    platforms are only meant for display of the small icons in the dialog 
+    A static bitmap control displays a bitmap. Native implementations on some
+    platforms are only meant for display of the small icons in the dialog
     boxes. In particular, under Windows 9x the size of bitmap is limited
     to 64*64 pixels.
-    If you want to display larger images portably, you may use generic 
-    implementation wxGenericStaticBitmap declared in <wx/generic/statbmpg.h>.
+
+    If you want to display larger images portably, you may use generic
+    implementation wxGenericStaticBitmap declared in \<wx/generic/statbmpg.h\>.
 
     @library{wxcore}
     @category{ctrl}
-    <!-- @appearance{staticbitmap.png} -->
+    @appearance{staticbitmap.png}
 
     @see wxStaticBitmap, wxStaticBox
 */
@@ -29,7 +30,7 @@ public:
       Default constructor
     */
     wxStaticBitmap();
-    
+
     /**
         Constructor, creating and showing a static bitmap control.
 
@@ -55,35 +56,33 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
-                   const wxString& name = "staticBitmap");
+                   const wxString& name = wxStaticBitmapNameStr);
 
     /**
         Creation function, for two-step construction. For details see wxStaticBitmap().
     */
-    bool Create(wxWindow* parent, wxWindowID id,
-                const wxBitmap& label,
+    bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& label,
                 const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = "staticBitmap");
+                const wxSize& size = wxDefaultSize, long style = 0,
+                const wxString& name = wxStaticBitmapNameStr);
 
     /**
-        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;
+    virtual wxBitmap GetBitmap() const;
 
     /**
-        Returns the icon currently used in the control. Notice that this method can
-        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).
+        Returns the icon currently used in the control.
+        Notice that this method can 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;
+    virtual wxIcon GetIcon() const;
 
     /**
         Sets the bitmap label.