wxDialogBase only has one ctor, so just do initialization in ctor instead of Init()

[wxWidgets.git] / include / wx / univ / statbmp.h

diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h
index 60ad9441fa4ee66903de3778948be8467110a137..c6496539151941dc8da275e2014a5f9c66cb037f 100644 (file)
--- a/include/wx/univ/statbmp.h
+++ b/include/wx/univ/statbmp.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.08.00
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,17 +11,13 @@
 #ifndef _WX_UNIV_STATBMP_H_
 #define _WX_UNIV_STATBMP_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univstatbmp.h"
-#endif
-
 #include "wx/bitmap.h"
 
 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
 
-class wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
 {
 public:
     wxStaticBitmap()
@@ -35,7 +30,7 @@ public:
                    const wxSize& size = wxDefaultSize,
                    long style = 0)
     {
-        Create(parent, -1, label, pos, size, style);
+        Create(parent, wxID_ANY, label, pos, size, style);
     }
 
     wxStaticBitmap(wxWindow *parent,
@@ -63,11 +58,12 @@ public:
 
     wxIcon GetIcon() const;
 
-    virtual bool HasTransparentBackground() { return TRUE; }
-    
-private:
+    virtual bool HasTransparentBackground() { return true; }
+
+protected:
     virtual void DoDraw(wxControlRenderer *renderer);
 
+private:
     // the bitmap which we show
     wxBitmap m_bitmap;