Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/interface/wx/statbmp.h b/interface/wx/statbmp.h
index 8fe3981cf9d46d46efed24ac066b0dc28380b823..c1e75089eeffd2cf7245a38c7e30afd71b58dbcb 100644 (file)
--- a/interface/wx/statbmp.h
+++ b/interface/wx/statbmp.h
@@ -2,8 +2,7 @@
 // Name:        statbmp.h
 // Purpose:     interface of wxStaticBitmap
 // Author:      wxWidgets team
-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -17,9 +16,15 @@
     If you want to display larger images portably, you may use generic
     implementation wxGenericStaticBitmap declared in \<wx/generic/statbmpg.h\>.
 
+    Notice that for the best results, the size of the control should be the
+    same as the size of the image displayed in it, as happens by default if
+    if it's not resized explicitly. Otherwise, behaviour depends on the
+    platform: under MSW, the bitmap is drawn centred inside the control, while
+    elsewhere it is drawn at the origin of the control.
+
     @library{wxcore}
     @category{ctrl}
-    <!-- @appearance{staticbitmap.png} -->
+    @appearance{staticbitmap}
 
     @see wxStaticBitmap, wxStaticBox
 */
@@ -56,17 +61,15 @@ 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.