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 f36675be7747c6d4f761b062906a1151b6a06c3b..213dafb8267d6ffe4690b361a12254906ef80ce7 100644 (file)
--- a/interface/wx/statbmp.h
+++ b/interface/wx/statbmp.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxStaticBitmap
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxStaticBitmap
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -56,17 +56,15 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    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().
     */
 
     /**
         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 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.
 
     /**
         Returns the bitmap currently used in the control.